diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-11 17:21:42 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-11 17:21:42 +0100 |
| commit | 91eb9a138383783371c6ec77357815e9241cd128 (patch) | |
| tree | 557005f8601023f3745180b8f57fcd0b7acc2f42 /sapi | |
| parent | 3b542021e471c2927e5225fa0680be4dbbc1da60 (diff) | |
| parent | 95a13ca989d8b1624eb6439d662723c026ac11e8 (diff) | |
| download | php-git-91eb9a138383783371c6ec77357815e9241cd128.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Revert fix for bug 76813 and re2c version bump
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/phpdbg/phpdbg_lexer.l | 6 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.y | 8 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/bug76813.phpt | 10 |
3 files changed, 3 insertions, 21 deletions
diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l index e57702ba0b..422cda4f2c 100644 --- a/sapi/phpdbg/phpdbg_lexer.l +++ b/sapi/phpdbg/phpdbg_lexer.l @@ -33,7 +33,7 @@ void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) { YYSETCONDITION(INITIAL); - LEX(text) = YYCURSOR = YYMARKER = (unsigned char *) input; + LEX(text) = YYCURSOR = (unsigned char *) input; LEX(len) = strlen(input); } @@ -165,10 +165,6 @@ INPUT ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])+["]|[']("\\"[']|"\\\\"|[^\ return T_ID; } -<NORMAL>* { - return T_UNEXPECTED; -} - <RAW>{INPUT} { phpdbg_init_param(yylval, STR_PARAM); yylval->str = estrdup(yytext); diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y index 2953b3bcce..2b57cd18de 100644 --- a/sapi/phpdbg/phpdbg_parser.y +++ b/sapi/phpdbg/phpdbg_parser.y @@ -64,13 +64,9 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg) %% /* Rules */ input - : non_empty_input { $$ = $1; } - | %empty - ; - -non_empty_input : command { $$ = $1; } - | non_empty_input T_SEPARATOR command { phpdbg_stack_separate($1.top); $$ = $3; } + | input T_SEPARATOR command { phpdbg_stack_separate($1.top); $$ = $3; } + | %empty ; command diff --git a/sapi/phpdbg/tests/bug76813.phpt b/sapi/phpdbg/tests/bug76813.phpt deleted file mode 100644 index 67a51d7316..0000000000 --- a/sapi/phpdbg/tests/bug76813.phpt +++ /dev/null @@ -1,10 +0,0 @@ ---TEST-- -Bug #76813 (Access_violation_near_NULL_on_source_operand) ---PHPDBG-- -"#!==)===\377\377\276\242=" -#!==)===\377\377\276\242= ---EXPECT-- -prompt> [Parse Error: syntax error, unexpected input, expecting end of command] -prompt> [Parse Error: syntax error, unexpected # (pound sign), expecting end of command] -prompt> [Parse Error: syntax error, unexpected # (pound sign), expecting end of command] -prompt> |