diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-08 13:50:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-08 13:57:28 +0200 |
| commit | af84d5737c47c3ec3959e056f171b14ab76fb7b8 (patch) | |
| tree | fb1289fc646a789dd13268fbcd560b6f4039bd22 /Zend/zend_language_scanner.l | |
| parent | e85545eca502b5eb74a88280e48e137a39839f61 (diff) | |
| download | php-git-af84d5737c47c3ec3959e056f171b14ab76fb7b8.tar.gz | |
Fix parser stack destruction with dummy ENCAPSED_AND_WHITESPACE
T_ENCAPSED_AND_WHITESPACE is now specified to always hold a value,
so give it a NULL value in the dummy cases.
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 9035777261..83ebe40498 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1764,6 +1764,7 @@ inline_html: /* Invalid rule to return a more explicit parse error with proper line number */ yyless(0); yy_pop_state(TSRMLS_C); + ZVAL_NULL(zendlval); return T_ENCAPSED_AND_WHITESPACE; } @@ -1878,6 +1879,7 @@ inline_html: /* Unclosed single quotes; treat similar to double quotes, but without a separate token * for ' (unrecognized by parser), instead of old flex fallback to "Unexpected character..." * rule, which continued in ST_IN_SCRIPTING state after the quote */ + ZVAL_NULL(zendlval); return T_ENCAPSED_AND_WHITESPACE; } } |