Merge pull request #3543 from airween/v3/parserfix

fix: nullptr dereference in seclang scanner

Author: airween

src/parser/driver.cc

@@ -144,7 +144,14 @@ int Driver::parse(const std::string &f, const std::string &ref) {
     scan_begin();
     yy::seclang_parser parser(*this);
     parser.set_debug_level(trace_parsing);
-    int res = parser.parse();
+    int res;
+    try {
+        res = parser.parse();
+    } catch (...) {
+        scan_end();
+        m_parserError << "Parser exception caught during rule parsing." << std::endl;
+        return 1;
+    }
     scan_end();
 
     /*

src/parser/seclang-parser.hh

@@ -32,7 +32,7 @@
 
 
 /**
- ** \file seclang-parser.tab.hh
+ ** \file y.tab.h
  ** Define the yy::parser class.
  */
 
@@ -42,8 +42,8 @@
 // especially those whose name start with YY_ or yy_.  They are
 // private implementation details that can be changed or removed.
 
-#ifndef YY_YY_SECLANG_PARSER_TAB_HH_INCLUDED
-# define YY_YY_SECLANG_PARSER_TAB_HH_INCLUDED
+#ifndef YY_YY_SECLANG_PARSER_HH_INCLUDED
+# define YY_YY_SECLANG_PARSER_HH_INCLUDED
 // "%code requires" blocks.
 #line 10 "seclang-parser.yy"
 
@@ -8892,4 +8892,4 @@ switch (yykind)
 
 
 
-#endif // !YY_YY_SECLANG_PARSER_TAB_HH_INCLUDED
+#endif // !YY_YY_SECLANG_PARSER_HH_INCLUDED