Fix UB on parser error and buffer overrun in yylex

2 files changed, 9 insertions, 6 deletions

diff --git a/src/gram.y b/src/gram.y
index 606181c..c9f7888 100755
--- a/src/gram.y
+++ b/src/gram.y
@@ -1239,12 +1239,15 @@ command:
     |    // nothing
     |    error   {
                      sc_error("syntax error: %s", line);
-                     line[0]='\0';
+                     YYABORT;
+
                      //linelim = 0;
                      //yyparse();
-                     linelim = -1;
-                     yyclearin;
-                     yyerrok;
+
+                     //line[0]='\0';
+                     //linelim = -1;
+                     //yyclearin;
+                     //yyerrok;
                  };
 
 term:   var                       {
diff --git a/src/lex.c b/src/lex.c
index 1b70241..5ff8eda 100644
--- a/src/lex.c
+++ b/src/lex.c
@@ -160,9 +160,9 @@ int yylex() {
                 for (tblp = linelim ? experres : statres; tblp->key; tblp++) {
                     if (((tblp->key[0]^tokenst[0])&0137)==0) {
                         int i = 1;
-                        while (i<tokenl && ((tokenst[i]^tblp->key[i])&0137)==0)
+                        while (tblp->key[i] && i<tokenl && ((tokenst[i]^tblp->key[i])&0137)==0)
                             i++;
-                        if (i >= tokenl) {
+                        if (i >= tokenl && tblp->key[i] == '\0') {
                             ret = tblp->val;
                             colstate = (ret <= S_FORMAT);
                             if (isgoto) {