From 54c51e25124bd25216a5a1787068b10dd7e17a1e Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Fri, 2 Oct 2015 11:03:04 -0300 Subject: [PATCH] Fix parser shift/reduce problem on state 133 --- src/parser/seclang-parser.yy | 2 -- src/parser/seclang-scanner.ll | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index 176584a5..0ec694be 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -259,11 +259,9 @@ using ModSecurity::Variables::Variable; input: input line | line - | SPACE ; line: expression - | expression SPACE ; audit_log: diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index 4158cdea..702522f5 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -170,7 +170,7 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile) driver.loc.back()->step(); %} -{DIRECTIVE} { return yy::seclang_parser::make_DIRECTIVE(yytext, *driver.loc.back()); } +[ \t]*{DIRECTIVE} { return yy::seclang_parser::make_DIRECTIVE(yytext, *driver.loc.back()); } {TRANSFORMATION} { return yy::seclang_parser::make_TRANSFORMATION(yytext, *driver.loc.back()); } {CONFIG_DIR_RULE_ENG} { return yy::seclang_parser::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } {CONFIG_DIR_RES_BODY} { return yy::seclang_parser::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } @@ -341,7 +341,7 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile) .*[^\\] { BEGIN(INITIAL); driver.loc.back()->lines(1); driver.loc.back()->step(); } } -[\n]+ { driver.loc.back()->lines(yyleng); driver.loc.back()->step(); } +[ \t]*[\n]+ { driver.loc.back()->lines(yyleng); driver.loc.back()->step(); } #[ \t]*SecRule[^\\]*\\\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } #[ \t]*SecRule[^\\]*\\\r\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); } #[ \t]*SecAction[^\\]*\\\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); BEGIN(COMMENT); }