github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Using stack to save parser state

Browse Source
This commit is contained in:
Felipe Zimmerle 2018-01-17 09:24:04 -03:00
parent b5e996602c
commit 6a97dbee7a
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 544 additions and 550 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1079
src/parser/seclang-scanner.cc
View File

File diff suppressed because it is too large Load Diff

15
src/parser/seclang-scanner.ll
View File

@ -15,8 +15,7 @@ using modsecurity::utils::string::parserSanitizer;
typedef yy::seclang_parser p; typedef yy::seclang_parser p;
static int state_variable_from = 0; static int state_variable_from = 0;
static int YY_PREVIOUS_STATE = 0; static std::stack<int> YY_PREVIOUS_STATE = 0;
static int YY_PREVIOUS_STATE2 = 0;
// Work around an incompatibility in flex (at least versions // Work around an incompatibility in flex (at least versions
// 2.5.31 through 2.5.33): it generates code that does // 2.5.31 through 2.5.33): it generates code that does
@ -25,10 +24,8 @@ static int YY_PREVIOUS_STATE2 = 0;
# undef yywrap # undef yywrap
# define yywrap() 1 # define yywrap() 1
#define BEGINX(z) { YY_PREVIOUS_STATE = YY_START; BEGIN(z); } #define BEGINX(z) { YY_PREVIOUS_STATE.push(YY_START); BEGIN(z); }
#define BEGINX2(z) { YY_PREVIOUS_STATE2 = YY_START; BEGIN(z); } #define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE.top()); YY_PREVIOUS_STATE.pop(); }
#define BEGIN_PREVIOUS() { BEGIN(YY_PREVIOUS_STATE); YY_PREVIOUS_STATE = 0; }
#define BEGIN_PREVIOUS2() { BEGIN(YY_PREVIOUS_STATE2); YY_PREVIOUS_STATE2 = 0; }
// The location of the current token. // The location of the current token.
%} %}
@ -554,8 +551,8 @@ EQUALS_MINUS (?i:=\-)
} }
<EXPECTING_ACTION_PREDICATE_VARIABLE>{ <EXPECTING_ACTION_PREDICATE_VARIABLE>{
[}] { BEGIN_PREVIOUS2(); } [}] { BEGIN_PREVIOUS(); }
[}][%] { BEGIN_PREVIOUS2(); } [}][%] { BEGIN_PREVIOUS(); }
} }
<ACTION_PREDICATE_ENDS_WITH_QUOTE>{ <ACTION_PREDICATE_ENDS_WITH_QUOTE>{
@ -574,7 +571,7 @@ EQUALS_MINUS (?i:=\-)
} }
<ACTION_PREDICATE_ENDS_WITH_QUOTE,ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE,ACTION_PREDICATE_ENDS_WITH_COMMA>{ <ACTION_PREDICATE_ENDS_WITH_QUOTE,ACTION_PREDICATE_ENDS_WITH_DOUBLE_QUOTE,ACTION_PREDICATE_ENDS_WITH_COMMA>{
{START_MACRO_VARIABLE} { BEGINX2(EXPECTING_ACTION_PREDICATE_VARIABLE); } {START_MACRO_VARIABLE} { BEGINX(EXPECTING_ACTION_PREDICATE_VARIABLE); }
. { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); } . { BEGIN(LEXING_ERROR_VARIABLE); yyless(0); }
} }