diff options
author | Anatol Belski <ab@php.net> | 2015-06-10 13:17:10 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2015-06-10 13:17:10 +0200 |
commit | 9ec3bb8a98abc40637f39936fae2f6313d96be6a (patch) | |
tree | a3112fa2cc5308b5ebdc463f33523a509ce71af6 | |
parent | 56ad2fcf2088da99cf30963440cd70e04ba227e1 (diff) | |
parent | b1f3403c9815c05fd14bdcc5954e58e25810bf1f (diff) | |
download | php-git-9ec3bb8a98abc40637f39936fae2f6313d96be6a.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
regenerated the ini scanner
-rw-r--r-- | Zend/zend_ini_scanner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c index 990a3733cd..6eb1ff716e 100644 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@ -1937,7 +1937,7 @@ end_raw_value_chars: } /* Eat leading and trailing double quotes */ - if (yytext[0] == '"' && yytext[yyleng - 1] == '"') { + if (yyleng > 1 && yytext[0] == '"' && yytext[yyleng - 1] == '"') { SCNG(yy_text)++; yyleng = yyleng - 2; } else if (sc) { |