[Forensics-changes] [yara] 90/192: Update grammars
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:31:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.6.0
in repository yara.
commit 784dba7c83043c2220e3daa2ebfdc9c44aefe54a
Author: plusvic <plusvic at gmail.com>
Date: Mon Jan 9 13:18:29 2017 +0100
Update grammars
---
libyara/grammar.c | 251 +++++++++++++++++++++++++++--------------------------
libyara/re_lexer.c | 103 ++++++++++++----------
2 files changed, 186 insertions(+), 168 deletions(-)
diff --git a/libyara/grammar.c b/libyara/grammar.c
index 6e5c46e..32427e6 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -612,13 +612,13 @@ static const yytype_uint16 yyrline[] =
472, 485, 502, 503, 509, 508, 524, 523, 539, 553,
554, 559, 560, 561, 562, 567, 652, 698, 756, 801,
802, 806, 831, 867, 913, 935, 944, 953, 968, 980,
- 994, 1007, 1018, 1024, 1054, 1023, 1168, 1167, 1246, 1252,
- 1259, 1258, 1321, 1320, 1381, 1390, 1399, 1408, 1417, 1426,
- 1435, 1439, 1447, 1448, 1453, 1475, 1487, 1503, 1502, 1508,
- 1519, 1520, 1525, 1532, 1543, 1544, 1548, 1556, 1560, 1570,
- 1584, 1600, 1610, 1619, 1644, 1656, 1668, 1684, 1696, 1712,
- 1757, 1776, 1794, 1812, 1830, 1856, 1874, 1884, 1894, 1904,
- 1914, 1924, 1934
+ 994, 1007, 1018, 1027, 1057, 1026, 1171, 1170, 1249, 1255,
+ 1262, 1261, 1324, 1323, 1384, 1393, 1402, 1411, 1420, 1429,
+ 1438, 1442, 1450, 1451, 1456, 1478, 1490, 1506, 1505, 1511,
+ 1522, 1523, 1528, 1535, 1546, 1547, 1551, 1559, 1563, 1573,
+ 1587, 1603, 1613, 1622, 1647, 1659, 1671, 1687, 1699, 1715,
+ 1760, 1779, 1797, 1815, 1833, 1859, 1877, 1887, 1897, 1907,
+ 1917, 1927, 1937
};
#endif
@@ -2587,14 +2587,17 @@ yyreduce:
case 62:
#line 1019 "grammar.y" /* yacc.c:1646 */
{
- compiler->loop_depth--;
- compiler->loop_identifier[compiler->loop_depth] = NULL;
+ if (compiler->loop_depth > 0)
+ {
+ compiler->loop_depth--;
+ compiler->loop_identifier[compiler->loop_depth] = NULL;
+ }
}
-#line 2594 "grammar.c" /* yacc.c:1646 */
+#line 2597 "grammar.c" /* yacc.c:1646 */
break;
case 63:
-#line 1024 "grammar.y" /* yacc.c:1646 */
+#line 1027 "grammar.y" /* yacc.c:1646 */
{
int var_index;
@@ -2624,11 +2627,11 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 2628 "grammar.c" /* yacc.c:1646 */
+#line 2631 "grammar.c" /* yacc.c:1646 */
break;
case 64:
-#line 1054 "grammar.y" /* yacc.c:1646 */
+#line 1057 "grammar.y" /* yacc.c:1646 */
{
int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;
uint8_t* addr;
@@ -2663,11 +2666,11 @@ yyreduce:
compiler->loop_identifier[compiler->loop_depth] = (yyvsp[-4].c_string);
compiler->loop_depth++;
}
-#line 2667 "grammar.c" /* yacc.c:1646 */
+#line 2670 "grammar.c" /* yacc.c:1646 */
break;
case 65:
-#line 1089 "grammar.y" /* yacc.c:1646 */
+#line 1092 "grammar.y" /* yacc.c:1646 */
{
int mem_offset;
@@ -2746,11 +2749,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 2750 "grammar.c" /* yacc.c:1646 */
+#line 2753 "grammar.c" /* yacc.c:1646 */
break;
case 66:
-#line 1168 "grammar.y" /* yacc.c:1646 */
+#line 1171 "grammar.y" /* yacc.c:1646 */
{
int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;
uint8_t* addr;
@@ -2780,11 +2783,11 @@ yyreduce:
compiler->loop_identifier[compiler->loop_depth] = NULL;
compiler->loop_depth++;
}
-#line 2784 "grammar.c" /* yacc.c:1646 */
+#line 2787 "grammar.c" /* yacc.c:1646 */
break;
case 67:
-#line 1198 "grammar.y" /* yacc.c:1646 */
+#line 1201 "grammar.y" /* yacc.c:1646 */
{
int mem_offset;
@@ -2833,31 +2836,31 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 2837 "grammar.c" /* yacc.c:1646 */
+#line 2840 "grammar.c" /* yacc.c:1646 */
break;
case 68:
-#line 1247 "grammar.y" /* yacc.c:1646 */
+#line 1250 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit(yyscanner, OP_OF, NULL);
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 2847 "grammar.c" /* yacc.c:1646 */
+#line 2850 "grammar.c" /* yacc.c:1646 */
break;
case 69:
-#line 1253 "grammar.y" /* yacc.c:1646 */
+#line 1256 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit(yyscanner, OP_NOT, NULL);
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 2857 "grammar.c" /* yacc.c:1646 */
+#line 2860 "grammar.c" /* yacc.c:1646 */
break;
case 70:
-#line 1259 "grammar.y" /* yacc.c:1646 */
+#line 1262 "grammar.y" /* yacc.c:1646 */
{
YR_FIXUP* fixup;
void* jmp_destination_addr;
@@ -2883,11 +2886,11 @@ yyreduce:
fixup->next = compiler->fixup_stack_head;
compiler->fixup_stack_head = fixup;
}
-#line 2887 "grammar.c" /* yacc.c:1646 */
+#line 2890 "grammar.c" /* yacc.c:1646 */
break;
case 71:
-#line 1285 "grammar.y" /* yacc.c:1646 */
+#line 1288 "grammar.y" /* yacc.c:1646 */
{
YR_FIXUP* fixup;
uint8_t* and_addr;
@@ -2923,11 +2926,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 2927 "grammar.c" /* yacc.c:1646 */
+#line 2930 "grammar.c" /* yacc.c:1646 */
break;
case 72:
-#line 1321 "grammar.y" /* yacc.c:1646 */
+#line 1324 "grammar.y" /* yacc.c:1646 */
{
YR_FIXUP* fixup;
void* jmp_destination_addr;
@@ -2952,11 +2955,11 @@ yyreduce:
fixup->next = compiler->fixup_stack_head;
compiler->fixup_stack_head = fixup;
}
-#line 2956 "grammar.c" /* yacc.c:1646 */
+#line 2959 "grammar.c" /* yacc.c:1646 */
break;
case 73:
-#line 1346 "grammar.y" /* yacc.c:1646 */
+#line 1349 "grammar.y" /* yacc.c:1646 */
{
YR_FIXUP* fixup;
uint8_t* or_addr;
@@ -2992,11 +2995,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 2996 "grammar.c" /* yacc.c:1646 */
+#line 2999 "grammar.c" /* yacc.c:1646 */
break;
case 74:
-#line 1382 "grammar.y" /* yacc.c:1646 */
+#line 1385 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "<", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3005,11 +3008,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 3009 "grammar.c" /* yacc.c:1646 */
+#line 3012 "grammar.c" /* yacc.c:1646 */
break;
case 75:
-#line 1391 "grammar.y" /* yacc.c:1646 */
+#line 1394 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, ">", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3018,11 +3021,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 3022 "grammar.c" /* yacc.c:1646 */
+#line 3025 "grammar.c" /* yacc.c:1646 */
break;
case 76:
-#line 1400 "grammar.y" /* yacc.c:1646 */
+#line 1403 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "<=", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3031,11 +3034,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 3035 "grammar.c" /* yacc.c:1646 */
+#line 3038 "grammar.c" /* yacc.c:1646 */
break;
case 77:
-#line 1409 "grammar.y" /* yacc.c:1646 */
+#line 1412 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, ">=", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3044,11 +3047,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 3048 "grammar.c" /* yacc.c:1646 */
+#line 3051 "grammar.c" /* yacc.c:1646 */
break;
case 78:
-#line 1418 "grammar.y" /* yacc.c:1646 */
+#line 1421 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "==", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3057,11 +3060,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 3061 "grammar.c" /* yacc.c:1646 */
+#line 3064 "grammar.c" /* yacc.c:1646 */
break;
case 79:
-#line 1427 "grammar.y" /* yacc.c:1646 */
+#line 1430 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "!=", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3070,39 +3073,39 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
}
-#line 3074 "grammar.c" /* yacc.c:1646 */
+#line 3077 "grammar.c" /* yacc.c:1646 */
break;
case 80:
-#line 1436 "grammar.y" /* yacc.c:1646 */
+#line 1439 "grammar.y" /* yacc.c:1646 */
{
(yyval.expression) = (yyvsp[0].expression);
}
-#line 3082 "grammar.c" /* yacc.c:1646 */
+#line 3085 "grammar.c" /* yacc.c:1646 */
break;
case 81:
-#line 1440 "grammar.y" /* yacc.c:1646 */
+#line 1443 "grammar.y" /* yacc.c:1646 */
{
(yyval.expression) = (yyvsp[-1].expression);
}
-#line 3090 "grammar.c" /* yacc.c:1646 */
+#line 3093 "grammar.c" /* yacc.c:1646 */
break;
case 82:
-#line 1447 "grammar.y" /* yacc.c:1646 */
+#line 1450 "grammar.y" /* yacc.c:1646 */
{ (yyval.integer) = INTEGER_SET_ENUMERATION; }
-#line 3096 "grammar.c" /* yacc.c:1646 */
+#line 3099 "grammar.c" /* yacc.c:1646 */
break;
case 83:
-#line 1448 "grammar.y" /* yacc.c:1646 */
+#line 1451 "grammar.y" /* yacc.c:1646 */
{ (yyval.integer) = INTEGER_SET_RANGE; }
-#line 3102 "grammar.c" /* yacc.c:1646 */
+#line 3105 "grammar.c" /* yacc.c:1646 */
break;
case 84:
-#line 1454 "grammar.y" /* yacc.c:1646 */
+#line 1457 "grammar.y" /* yacc.c:1646 */
{
if ((yyvsp[-3].expression).type != EXPRESSION_TYPE_INTEGER)
{
@@ -3120,11 +3123,11 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3124 "grammar.c" /* yacc.c:1646 */
+#line 3127 "grammar.c" /* yacc.c:1646 */
break;
case 85:
-#line 1476 "grammar.y" /* yacc.c:1646 */
+#line 1479 "grammar.y" /* yacc.c:1646 */
{
if ((yyvsp[0].expression).type != EXPRESSION_TYPE_INTEGER)
{
@@ -3136,11 +3139,11 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3140 "grammar.c" /* yacc.c:1646 */
+#line 3143 "grammar.c" /* yacc.c:1646 */
break;
case 86:
-#line 1488 "grammar.y" /* yacc.c:1646 */
+#line 1491 "grammar.y" /* yacc.c:1646 */
{
if ((yyvsp[0].expression).type != EXPRESSION_TYPE_INTEGER)
{
@@ -3151,77 +3154,77 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3155 "grammar.c" /* yacc.c:1646 */
+#line 3158 "grammar.c" /* yacc.c:1646 */
break;
case 87:
-#line 1503 "grammar.y" /* yacc.c:1646 */
+#line 1506 "grammar.y" /* yacc.c:1646 */
{
// Push end-of-list marker
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL, NULL);
}
-#line 3164 "grammar.c" /* yacc.c:1646 */
+#line 3167 "grammar.c" /* yacc.c:1646 */
break;
case 89:
-#line 1509 "grammar.y" /* yacc.c:1646 */
+#line 1512 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL, NULL);
yr_parser_emit_pushes_for_strings(yyscanner, "$*");
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3175 "grammar.c" /* yacc.c:1646 */
+#line 3178 "grammar.c" /* yacc.c:1646 */
break;
case 92:
-#line 1526 "grammar.y" /* yacc.c:1646 */
+#line 1529 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[0].c_string));
yr_free((yyvsp[0].c_string));
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3186 "grammar.c" /* yacc.c:1646 */
+#line 3189 "grammar.c" /* yacc.c:1646 */
break;
case 93:
-#line 1533 "grammar.y" /* yacc.c:1646 */
+#line 1536 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[0].c_string));
yr_free((yyvsp[0].c_string));
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3197 "grammar.c" /* yacc.c:1646 */
+#line 3200 "grammar.c" /* yacc.c:1646 */
break;
case 95:
-#line 1545 "grammar.y" /* yacc.c:1646 */
+#line 1548 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL, NULL);
}
-#line 3205 "grammar.c" /* yacc.c:1646 */
+#line 3208 "grammar.c" /* yacc.c:1646 */
break;
case 96:
-#line 1549 "grammar.y" /* yacc.c:1646 */
+#line 1552 "grammar.y" /* yacc.c:1646 */
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, 1, NULL, NULL);
}
-#line 3213 "grammar.c" /* yacc.c:1646 */
+#line 3216 "grammar.c" /* yacc.c:1646 */
break;
case 97:
-#line 1557 "grammar.y" /* yacc.c:1646 */
+#line 1560 "grammar.y" /* yacc.c:1646 */
{
(yyval.expression) = (yyvsp[-1].expression);
}
-#line 3221 "grammar.c" /* yacc.c:1646 */
+#line 3224 "grammar.c" /* yacc.c:1646 */
break;
case 98:
-#line 1561 "grammar.y" /* yacc.c:1646 */
+#line 1564 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_emit(
yyscanner, OP_FILESIZE, NULL);
@@ -3231,11 +3234,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3235 "grammar.c" /* yacc.c:1646 */
+#line 3238 "grammar.c" /* yacc.c:1646 */
break;
case 99:
-#line 1571 "grammar.y" /* yacc.c:1646 */
+#line 1574 "grammar.y" /* yacc.c:1646 */
{
yywarning(yyscanner,
"Using deprecated \"entrypoint\" keyword. Use the \"entry_point\" "
@@ -3249,11 +3252,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3253 "grammar.c" /* yacc.c:1646 */
+#line 3256 "grammar.c" /* yacc.c:1646 */
break;
case 100:
-#line 1585 "grammar.y" /* yacc.c:1646 */
+#line 1588 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-1].expression), EXPRESSION_TYPE_INTEGER, "intXXXX or uintXXXX");
@@ -3269,11 +3272,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3273 "grammar.c" /* yacc.c:1646 */
+#line 3276 "grammar.c" /* yacc.c:1646 */
break;
case 101:
-#line 1601 "grammar.y" /* yacc.c:1646 */
+#line 1604 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner, OP_PUSH, (yyvsp[0].integer), NULL, NULL);
@@ -3283,11 +3286,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = (yyvsp[0].integer);
}
-#line 3287 "grammar.c" /* yacc.c:1646 */
+#line 3290 "grammar.c" /* yacc.c:1646 */
break;
case 102:
-#line 1611 "grammar.y" /* yacc.c:1646 */
+#line 1614 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_emit_with_arg_double(
yyscanner, OP_PUSH, (yyvsp[0].double_), NULL, NULL);
@@ -3296,11 +3299,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_FLOAT;
}
-#line 3300 "grammar.c" /* yacc.c:1646 */
+#line 3303 "grammar.c" /* yacc.c:1646 */
break;
case 103:
-#line 1620 "grammar.y" /* yacc.c:1646 */
+#line 1623 "grammar.y" /* yacc.c:1646 */
{
SIZED_STRING* sized_string;
@@ -3325,11 +3328,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_STRING;
(yyval.expression).value.sized_string = sized_string;
}
-#line 3329 "grammar.c" /* yacc.c:1646 */
+#line 3332 "grammar.c" /* yacc.c:1646 */
break;
case 104:
-#line 1645 "grammar.y" /* yacc.c:1646 */
+#line 1648 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner, (yyvsp[0].c_string), OP_COUNT, UNDEFINED);
@@ -3341,11 +3344,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3345 "grammar.c" /* yacc.c:1646 */
+#line 3348 "grammar.c" /* yacc.c:1646 */
break;
case 105:
-#line 1657 "grammar.y" /* yacc.c:1646 */
+#line 1660 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner, (yyvsp[-3].c_string), OP_OFFSET, UNDEFINED);
@@ -3357,11 +3360,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3361 "grammar.c" /* yacc.c:1646 */
+#line 3364 "grammar.c" /* yacc.c:1646 */
break;
case 106:
-#line 1669 "grammar.y" /* yacc.c:1646 */
+#line 1672 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner, OP_PUSH, 1, NULL, NULL);
@@ -3377,11 +3380,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3381 "grammar.c" /* yacc.c:1646 */
+#line 3384 "grammar.c" /* yacc.c:1646 */
break;
case 107:
-#line 1685 "grammar.y" /* yacc.c:1646 */
+#line 1688 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner, (yyvsp[-3].c_string), OP_LENGTH, UNDEFINED);
@@ -3393,11 +3396,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3397 "grammar.c" /* yacc.c:1646 */
+#line 3400 "grammar.c" /* yacc.c:1646 */
break;
case 108:
-#line 1697 "grammar.y" /* yacc.c:1646 */
+#line 1700 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner, OP_PUSH, 1, NULL, NULL);
@@ -3413,11 +3416,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = UNDEFINED;
}
-#line 3417 "grammar.c" /* yacc.c:1646 */
+#line 3420 "grammar.c" /* yacc.c:1646 */
break;
case 109:
-#line 1713 "grammar.y" /* yacc.c:1646 */
+#line 1716 "grammar.y" /* yacc.c:1646 */
{
if ((yyvsp[0].expression).type == EXPRESSION_TYPE_INTEGER) // loop identifier
{
@@ -3462,11 +3465,11 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3466 "grammar.c" /* yacc.c:1646 */
+#line 3469 "grammar.c" /* yacc.c:1646 */
break;
case 110:
-#line 1758 "grammar.y" /* yacc.c:1646 */
+#line 1761 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER | EXPRESSION_TYPE_FLOAT, "-");
@@ -3485,11 +3488,11 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
-#line 3489 "grammar.c" /* yacc.c:1646 */
+#line 3492 "grammar.c" /* yacc.c:1646 */
break;
case 111:
-#line 1777 "grammar.y" /* yacc.c:1646 */
+#line 1780 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "+", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3507,11 +3510,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_FLOAT;
}
}
-#line 3511 "grammar.c" /* yacc.c:1646 */
+#line 3514 "grammar.c" /* yacc.c:1646 */
break;
case 112:
-#line 1795 "grammar.y" /* yacc.c:1646 */
+#line 1798 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "-", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3529,11 +3532,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_FLOAT;
}
}
-#line 3533 "grammar.c" /* yacc.c:1646 */
+#line 3536 "grammar.c" /* yacc.c:1646 */
break;
case 113:
-#line 1813 "grammar.y" /* yacc.c:1646 */
+#line 1816 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "*", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3551,11 +3554,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_FLOAT;
}
}
-#line 3555 "grammar.c" /* yacc.c:1646 */
+#line 3558 "grammar.c" /* yacc.c:1646 */
break;
case 114:
-#line 1831 "grammar.y" /* yacc.c:1646 */
+#line 1834 "grammar.y" /* yacc.c:1646 */
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "\\", (yyvsp[-2].expression), (yyvsp[0].expression));
@@ -3581,11 +3584,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_FLOAT;
}
}
-#line 3585 "grammar.c" /* yacc.c:1646 */
+#line 3588 "grammar.c" /* yacc.c:1646 */
break;
case 115:
-#line 1857 "grammar.y" /* yacc.c:1646 */
+#line 1860 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-2].expression), EXPRESSION_TYPE_INTEGER, "%");
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, "%");
@@ -3603,11 +3606,11 @@ yyreduce:
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
}
-#line 3607 "grammar.c" /* yacc.c:1646 */
+#line 3610 "grammar.c" /* yacc.c:1646 */
break;
case 116:
-#line 1875 "grammar.y" /* yacc.c:1646 */
+#line 1878 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-2].expression), EXPRESSION_TYPE_INTEGER, "^");
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, "^");
@@ -3617,11 +3620,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = OPERATION(^, (yyvsp[-2].expression).value.integer, (yyvsp[0].expression).value.integer);
}
-#line 3621 "grammar.c" /* yacc.c:1646 */
+#line 3624 "grammar.c" /* yacc.c:1646 */
break;
case 117:
-#line 1885 "grammar.y" /* yacc.c:1646 */
+#line 1888 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-2].expression), EXPRESSION_TYPE_INTEGER, "^");
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, "^");
@@ -3631,11 +3634,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = OPERATION(&, (yyvsp[-2].expression).value.integer, (yyvsp[0].expression).value.integer);
}
-#line 3635 "grammar.c" /* yacc.c:1646 */
+#line 3638 "grammar.c" /* yacc.c:1646 */
break;
case 118:
-#line 1895 "grammar.y" /* yacc.c:1646 */
+#line 1898 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-2].expression), EXPRESSION_TYPE_INTEGER, "|");
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, "|");
@@ -3645,11 +3648,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = OPERATION(|, (yyvsp[-2].expression).value.integer, (yyvsp[0].expression).value.integer);
}
-#line 3649 "grammar.c" /* yacc.c:1646 */
+#line 3652 "grammar.c" /* yacc.c:1646 */
break;
case 119:
-#line 1905 "grammar.y" /* yacc.c:1646 */
+#line 1908 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, "~");
@@ -3659,11 +3662,11 @@ yyreduce:
(yyval.expression).value.integer = ((yyvsp[0].expression).value.integer == UNDEFINED) ?
UNDEFINED : ~((yyvsp[0].expression).value.integer);
}
-#line 3663 "grammar.c" /* yacc.c:1646 */
+#line 3666 "grammar.c" /* yacc.c:1646 */
break;
case 120:
-#line 1915 "grammar.y" /* yacc.c:1646 */
+#line 1918 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-2].expression), EXPRESSION_TYPE_INTEGER, "<<");
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, "<<");
@@ -3673,11 +3676,11 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = OPERATION(<<, (yyvsp[-2].expression).value.integer, (yyvsp[0].expression).value.integer);
}
-#line 3677 "grammar.c" /* yacc.c:1646 */
+#line 3680 "grammar.c" /* yacc.c:1646 */
break;
case 121:
-#line 1925 "grammar.y" /* yacc.c:1646 */
+#line 1928 "grammar.y" /* yacc.c:1646 */
{
CHECK_TYPE((yyvsp[-2].expression), EXPRESSION_TYPE_INTEGER, ">>");
CHECK_TYPE((yyvsp[0].expression), EXPRESSION_TYPE_INTEGER, ">>");
@@ -3687,19 +3690,19 @@ yyreduce:
(yyval.expression).type = EXPRESSION_TYPE_INTEGER;
(yyval.expression).value.integer = OPERATION(>>, (yyvsp[-2].expression).value.integer, (yyvsp[0].expression).value.integer);
}
-#line 3691 "grammar.c" /* yacc.c:1646 */
+#line 3694 "grammar.c" /* yacc.c:1646 */
break;
case 122:
-#line 1935 "grammar.y" /* yacc.c:1646 */
+#line 1938 "grammar.y" /* yacc.c:1646 */
{
(yyval.expression) = (yyvsp[0].expression);
}
-#line 3699 "grammar.c" /* yacc.c:1646 */
+#line 3702 "grammar.c" /* yacc.c:1646 */
break;
-#line 3703 "grammar.c" /* yacc.c:1646 */
+#line 3706 "grammar.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -3927,5 +3930,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 1940 "grammar.y" /* yacc.c:1906 */
+#line 1943 "grammar.y" /* yacc.c:1906 */
diff --git a/libyara/re_lexer.c b/libyara/re_lexer.c
index a64850c..82d4871 100644
--- a/libyara/re_lexer.c
+++ b/libyara/re_lexer.c
@@ -9,7 +9,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 1
+#define YY_FLEX_SUBMINOR_VERSION 0
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -88,13 +88,25 @@ typedef unsigned int flex_uint32_t;
#endif /* ! FLEXINT_H */
-/* TODO: this is always defined, so inline it */
-#define yyconst const
+#ifdef __cplusplus
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define yynoreturn __attribute__((__noreturn__))
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else /* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
#else
-#define yynoreturn
+#define yyconst
#endif
/* Returned upon end-of-file. */
@@ -226,12 +238,12 @@ struct yy_buffer_state
/* Size of input buffer in bytes, not including room for EOB
* characters.
*/
- int yy_buf_size;
+ yy_size_t yy_buf_size;
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- int yy_n_chars;
+ yy_size_t yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -310,7 +322,7 @@ static void re_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner
YY_BUFFER_STATE re_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
YY_BUFFER_STATE re_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE re_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE re_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
void *re_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *re_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -354,14 +366,17 @@ typedef int yy_state_type;
static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner);
static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yynoreturn yy_fatal_error (yyconst char* msg ,yyscan_t yyscanner );
+#if defined(__GNUC__) && __GNUC__ >= 3
+__attribute__((__noreturn__))
+#endif
+static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
/* Done after the current pattern has been matched and before the
* corresponding action - sets up yytext.
*/
#define YY_DO_BEFORE_ACTION \
yyg->yytext_ptr = yy_bp; \
- yyleng = (int) (yy_cp - yy_bp); \
+ yyleng = (size_t) (yy_cp - yy_bp); \
yyg->yy_hold_char = *yy_cp; \
*yy_cp = '\0'; \
yyg->yy_c_buf_p = yy_cp;
@@ -567,7 +582,7 @@ int read_escaped_char(
#define YY_NO_UNISTD_H 1
-#line 571 "re_lexer.c"
+#line 586 "re_lexer.c"
#define INITIAL 0
#define char_class 1
@@ -597,8 +612,8 @@ struct yyguts_t
size_t yy_buffer_stack_max; /**< capacity of stack. */
YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
char yy_hold_char;
- int yy_n_chars;
- int yyleng_r;
+ yy_size_t yy_n_chars;
+ yy_size_t yyleng_r;
char *yy_c_buf_p;
int yy_init;
int yy_start;
@@ -651,7 +666,7 @@ FILE *re_yyget_out (yyscan_t yyscanner );
void re_yyset_out (FILE * _out_str ,yyscan_t yyscanner );
- int re_yyget_leng (yyscan_t yyscanner );
+yy_size_t re_yyget_leng (yyscan_t yyscanner );
char *re_yyget_text (yyscan_t yyscanner );
@@ -716,7 +731,7 @@ static int input (yyscan_t yyscanner );
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -740,7 +755,7 @@ static int input (yyscan_t yyscanner );
else \
{ \
errno=0; \
- while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+ while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
{ \
if( errno != EINTR) \
{ \
@@ -844,7 +859,7 @@ YY_DECL
#line 99 "re_lexer.l"
-#line 848 "re_lexer.c"
+#line 863 "re_lexer.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -874,7 +889,7 @@ yy_match:
if ( yy_current_state >= 45 )
yy_c = yy_meta[(unsigned int) yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
while ( yy_current_state != 44 );
@@ -1339,7 +1354,7 @@ YY_RULE_SETUP
#line 464 "re_lexer.l"
ECHO;
YY_BREAK
-#line 1343 "re_lexer.c"
+#line 1358 "re_lexer.c"
case YY_END_OF_BUFFER:
{
@@ -1526,7 +1541,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else
{
- int num_to_read =
+ yy_size_t num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -1540,7 +1555,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( b->yy_is_our_buffer )
{
- int new_size = b->yy_buf_size * 2;
+ yy_size_t new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -1553,7 +1568,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
}
else
/* Can't grow it, we don't own it. */
- b->yy_ch_buf = NULL;
+ b->yy_ch_buf = 0;
if ( ! b->yy_ch_buf )
YY_FATAL_ERROR(
@@ -1595,9 +1610,9 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else
ret_val = EOB_ACT_CONTINUE_SCAN;
- if ((int) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+ if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
/* Extend the array by 50%, plus the number we really need. */
- int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+ yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) re_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
@@ -1636,7 +1651,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( yy_current_state >= 45 )
yy_c = yy_meta[(unsigned int) yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
}
return yy_current_state;
@@ -1665,7 +1680,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
if ( yy_current_state >= 45 )
yy_c = yy_meta[(unsigned int) yy_c];
}
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
+ yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
yy_is_jam = (yy_current_state == 44);
(void)yyg;
@@ -1701,7 +1716,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
else
{ /* need more input */
- int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+ yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
++yyg->yy_c_buf_p;
switch ( yy_get_next_buffer( yyscanner ) )
@@ -1725,7 +1740,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
case EOB_ACT_END_OF_FILE:
{
if ( re_yywrap(yyscanner ) )
- return 0;
+ return EOF;
if ( ! yyg->yy_did_buffer_switch_on_eof )
YY_NEW_FILE;
@@ -1988,7 +2003,7 @@ void re_yypop_buffer_state (yyscan_t yyscanner)
*/
static void re_yyensure_buffer_stack (yyscan_t yyscanner)
{
- int num_to_alloc;
+ yy_size_t num_to_alloc;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
if (!yyg->yy_buffer_stack) {
@@ -1997,7 +2012,7 @@ static void re_yyensure_buffer_stack (yyscan_t yyscanner)
* scanner will even need a stack. We use 2 instead of 1 to avoid an
* immediate realloc on the next call.
*/
- num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+ num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
yyg->yy_buffer_stack = (struct yy_buffer_state**)re_yyalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
, yyscanner);
@@ -2044,7 +2059,7 @@ YY_BUFFER_STATE re_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yysc
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
/* They forgot to leave room for the EOB's. */
- return NULL;
+ return 0;
b = (YY_BUFFER_STATE) re_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
if ( ! b )
@@ -2053,7 +2068,7 @@ YY_BUFFER_STATE re_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yysc
b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */
b->yy_buf_pos = b->yy_ch_buf = base;
b->yy_is_our_buffer = 0;
- b->yy_input_file = NULL;
+ b->yy_input_file = 0;
b->yy_n_chars = b->yy_buf_size;
b->yy_is_interactive = 0;
b->yy_at_bol = 1;
@@ -2076,7 +2091,7 @@ YY_BUFFER_STATE re_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yysc
YY_BUFFER_STATE re_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
{
- return re_yy_scan_bytes(yystr,(int) strlen(yystr) ,yyscanner);
+ return re_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
}
/** Setup the input buffer state to scan the given bytes. The next call to re_yylex() will
@@ -2086,7 +2101,7 @@ YY_BUFFER_STATE re_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE re_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE re_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
char *buf;
@@ -2094,7 +2109,7 @@ YY_BUFFER_STATE re_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , y
yy_size_t i;
/* Get memory for full buffer, including space for trailing EOB's. */
- n = (yy_size_t) _yybytes_len + 2;
+ n = _yybytes_len + 2;
buf = (char *) re_yyalloc(n ,yyscanner );
if ( ! buf )
YY_FATAL_ERROR( "out of dynamic memory in re_yy_scan_bytes()" );
@@ -2120,7 +2135,7 @@ YY_BUFFER_STATE re_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len , y
#define YY_EXIT_FAILURE 2
#endif
-static void yynoreturn yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
+static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
@@ -2203,7 +2218,7 @@ FILE *re_yyget_out (yyscan_t yyscanner)
/** Get the length of the current token.
* @param yyscanner The scanner object.
*/
-int re_yyget_leng (yyscan_t yyscanner)
+yy_size_t re_yyget_leng (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng;
@@ -2374,10 +2389,10 @@ static int yy_init_globals (yyscan_t yyscanner)
* This function is called from re_yylex_destroy(), so don't allocate here.
*/
- yyg->yy_buffer_stack = NULL;
+ yyg->yy_buffer_stack = 0;
yyg->yy_buffer_stack_top = 0;
yyg->yy_buffer_stack_max = 0;
- yyg->yy_c_buf_p = NULL;
+ yyg->yy_c_buf_p = (char *) 0;
yyg->yy_init = 0;
yyg->yy_start = 0;
@@ -2390,8 +2405,8 @@ static int yy_init_globals (yyscan_t yyscanner)
yyin = stdin;
yyout = stdout;
#else
- yyin = NULL;
- yyout = NULL;
+ yyin = (FILE *) 0;
+ yyout = (FILE *) 0;
#endif
/* For future reference: Set errno on error, since we are called by
@@ -2461,7 +2476,7 @@ void *re_yyalloc (yy_size_t size , yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
(void)yyg;
- return malloc(size);
+ return (void *) malloc( size );
}
void *re_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
@@ -2476,7 +2491,7 @@ void *re_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner)
* any pointer type to void*, and deal with argument conversions
* as though doing an assignment.
*/
- return realloc(ptr, size);
+ return (void *) realloc( (char *) ptr, size );
}
void re_yyfree (void * ptr , yyscan_t yyscanner)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list