diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2023-11-01 22:12:55 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2023-11-02 20:58:39 (GMT) |
| commit | 72023cf93c4a2b27d4a6ed894e7e4f0f586cfc14 (patch) | |
| tree | fe5f9bf90c89e9a697d60e1fbcdd2edd0b14727b | |
| parent | 384a83a4c36778c4cb2b3e2403b62862966e6544 (diff) | |
Fix a few regressions thanks to the test suite.
| -rw-r--r-- | src/analysis/scan/grammar.y | 4 | ||||
| -rw-r--r-- | src/analysis/scan/patterns/tokens/nodes/plain.c | 2 | ||||
| -rw-r--r-- | src/analysis/scan/tokens.l | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/analysis/scan/grammar.y b/src/analysis/scan/grammar.y index ecaeb1f..84eda7a 100644 --- a/src/analysis/scan/grammar.y +++ b/src/analysis/scan/grammar.y @@ -1056,12 +1056,12 @@ YY_DECL; } | ESCAPED_TEXT { - $$ = g_scan_literal_expression_new(LVT_STRING, &$1); + $$ = g_scan_literal_expression_new(LVT_STRING, $1); } | ESCAPED_TEXT "[" cexpression "]" { GScanExpression *__src; - __src = g_scan_literal_expression_new(LVT_STRING, &$1); + __src = g_scan_literal_expression_new(LVT_STRING, $1); $$ = g_scan_set_item_new(__src, $3); g_object_unref(G_OBJECT(__src)); g_object_unref(G_OBJECT($3)); diff --git a/src/analysis/scan/patterns/tokens/nodes/plain.c b/src/analysis/scan/patterns/tokens/nodes/plain.c index cca0258..71f5f17 100644 --- a/src/analysis/scan/patterns/tokens/nodes/plain.c +++ b/src/analysis/scan/patterns/tokens/nodes/plain.c @@ -577,8 +577,6 @@ static void g_scan_token_node_plain_check_forward(const GScanTokenNodePlain *nod track_path = (G_SCAN_TOKEN_NODE(node)->flags & STNF_MAIN); - assert((track_path && !initialized) || !track_path); - nocase = (node->flags & SPNF_CASE_INSENSITIVE); get_node_search_offset_ranges(offset, &ocount); diff --git a/src/analysis/scan/tokens.l b/src/analysis/scan/tokens.l index 98c7bd8..b1543c9 100644 --- a/src/analysis/scan/tokens.l +++ b/src/analysis/scan/tokens.l @@ -531,8 +531,6 @@ bytes_fuzzy_id [\*A-Za-z_][\*A-Za-z0-9_]* } <condition>\"{str_mixed}*\" { - POP_STATE; - rost_unescape_string_bytes(yytext + 1, yyleng - 2, tmp_0); #ifndef NDEBUG |