diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 10:44:44 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 10:44:44 +0200 |
| commit | a96345d12b77c4565c67db0ee7a42c41567cc24a (patch) | |
| tree | 2e43d1e5e7222486e163ff212e52041586f762a7 /Zend/zend_ini_scanner.l | |
| parent | 5ff259ebb72c1f5cef45c235ca1a85b8e1523835 (diff) | |
| parent | f4707ed2560abf1dcdad2796ba4648ee4b17ecda (diff) | |
| download | php-git-a96345d12b77c4565c67db0ee7a42c41567cc24a.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
fixed bug, where a linebreak immediately after an opening quote of a value caused a segfault
made failing test more meaningful
added failing test
Diffstat (limited to 'Zend/zend_ini_scanner.l')
| -rw-r--r-- | Zend/zend_ini_scanner.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l index c82d79383f..8cc7266ebb 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -524,7 +524,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) { |