From 641e326303753575664ca146fee7e9148d6bf5cf Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 6 Mar 2020 09:05:52 +0100 Subject: [PATCH] code: be robust to reference with invalid tags Because we want to support $b>$, we must accept -> in type tags, and reject $<->$, as it is unfinished. Reported by Ahcheong Lee. * src/scan-code.l (yylex): Make sure "tag" does not end with -, since -> does not close the tag. * tests/input.at (Stray $ or @): Check this. --- THANKS | 3 ++- src/scan-code.l | 2 +- tests/input.at | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/THANKS b/THANKS index db54776a..d8ef2c0c 100644 --- a/THANKS +++ b/THANKS @@ -4,8 +4,9 @@ it is today without the invaluable help of these people: Aaro Koskinen aaro.koskinen@iki.fi Аскар Сафин safinaskar@mail.ru Adam Sampson ats@offog.org +Ahcheong Lee dkcjd2000@gmail.com Airy Andre Airy.Andre@edf.fr -Akim Demaille akim@lrde.epita.fr +Akim Demaille akim@gnu.org Albert Chin-A-Young china@thewrittenword.com Alexander Belopolsky alexb@rentec.com Alexandre Duret-Lutz adl@lrde.epita.fr diff --git a/src/scan-code.l b/src/scan-code.l index 658c25b1..ef667146 100644 --- a/src/scan-code.l +++ b/src/scan-code.l @@ -81,7 +81,7 @@ static bool untyped_var_seen; historically almost any character is allowed in a tag. We disallow NUL and newline, as this simplifies our implementation. We allow "->" as a means to dereference a pointer. */ -tag ([^\0\n>]|->)+ +tag ([^\0\n>]|->)*[^-] /* Zero or more instances of backslash-newline. Following GCC, allow white space between the backslash and the newline. */ diff --git a/tests/input.at b/tests/input.at index c03b282f..b004ea9e 100644 --- a/tests/input.at +++ b/tests/input.at @@ -2548,7 +2548,9 @@ AT_DATA_GRAMMAR([[input.y]], %printer { $%; @%; } <*> exp TOK; %{ $ @ %} // Should not warn. %% -exp: TOK { $%; @%; $$ = $1; }; +exp: TOK { $%; @%; $$ = $1; } + | 'a' { $<->1; $$ = 1; } + | 'b' { $bar>$; } %% $ @ // Should not warn. ]]) @@ -2562,6 +2564,7 @@ input.y:13.19: warning: stray '$' [-Wother] input.y:13.23: warning: stray '@' [-Wother] input.y:16.19: warning: stray '$' [-Wother] input.y:16.23: warning: stray '@' [-Wother] +input.y:17.19: warning: stray '$' [-Wother] ]]) AT_BISON_OPTION_POPDEFS