diff options
| author | Anatol Belski <ab@php.net> | 2015-06-10 10:43:23 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-06-10 10:43:23 +0200 |
| commit | ca467d5117667737dd482971319358430b95ea97 (patch) | |
| tree | dab05b90ea2ad3c3170282ac143fb1d67b34ba41 /Zend/zend_ini_scanner.l | |
| parent | b5d5baa8823ab29386c11be1046ddfe7aee43b7f (diff) | |
| parent | aef5a02ebb87212f9bd5afd44f70a03d23cb62dc (diff) | |
| download | php-git-ca467d5117667737dd482971319358430b95ea97.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 fa586575f4..9cf8b4fe0a 100644 --- a/Zend/zend_ini_scanner.l +++ b/Zend/zend_ini_scanner.l @@ -523,7 +523,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) { |