diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 13:16:29 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 13:16:29 +0200 |
| commit | b1f3403c9815c05fd14bdcc5954e58e25810bf1f (patch) | |
| tree | 9fa3b9ee5c639c032f94ed3246517bcab2aa5648 /Zend | |
| parent | 2c55ae526121bc608ed912ede20d752885082fc8 (diff) | |
| parent | f14141aca2eb675c8f5b0dc246ec4f04b0271218 (diff) | |
| download | php-git-b1f3403c9815c05fd14bdcc5954e58e25810bf1f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
regenerated the ini scanner
Diffstat (limited to 'Zend')
| -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 c4727d33e4..dbebb2ce68 100644 --- a/Zend/zend_ini_scanner.c +++ b/Zend/zend_ini_scanner.c @@ -2029,7 +2029,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) { |