From 72023cf93c4a2b27d4a6ed894e7e4f0f586cfc14 Mon Sep 17 00:00:00 2001
From: Cyrille Bagard <nocbos@gmail.com>
Date: Wed, 1 Nov 2023 23:12:55 +0100
Subject: Fix a few regressions thanks to the test suite.
---
src/analysis/scan/grammar.y | 4 ++--
src/analysis/scan/patterns/tokens/nodes/plain.c | 2 --
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
--
cgit v0.11.2-87-g4458