nixd/Parser: fix trailing-slash causing infinite loop in the Lexer

Fixes: #231
nix-community · Jul 26, 2023 · 9a232a2 · 9a232a2
1 parent b835f4e
commit 9a232a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/nixd/lib/Parser/Lexer.l b/nixd/lib/Parser/Lexer.l
@@ -66,16 +66,19 @@ or          { return OR_KW; }
                       .msg = hintfmt("invalid integer '%1%'", yytext),
                       .errPos = data->state.positions[CUR_POS],
                   });
+                  yyterminate();
               }
               return INT;
             }
 {FLOAT}     { errno = 0;
               yylval->nf = strtod(yytext, 0);
-              if (errno != 0)
+              if (errno != 0) {
                   data->error.emplace_back(nix::ErrorInfo{
                       .msg = hintfmt("invalid float '%1%'", yytext),
                       .errPos = data->state.positions[CUR_POS],
                   });
+                  yyterminate();
+              }
               return FLOAT;
             }
 
@@ -205,6 +208,7 @@ or          { return OR_KW; }
       .msg = hintfmt("path has a trailing slash"),
       .errPos = data->state.positions[CUR_POS],
   });
+  yyterminate();
 }
 
 {SPATH}     { yylval->path = {yytext, (size_t) yyleng}; return SPATH; }

diff --git a/nixd/tools/nixd-ast-dump/test/issue-231.nix b/nixd/tools/nixd-ast-dump/test/issue-231.nix
@@ -0,0 +1,3 @@
+# RUN: valgrind --leak-check=full --error-exitcode=1 nixd-ast-dump %s
+
+/././