Fixed bug #36046 (parse_ini_file() miscounts lines in multi-line values).

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index dd9e621b3087e456cf2956910c7b8745eef81e9a..2495c603607747c669f41802842930a6bdaa3cd1 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -139,8 +139,18 @@ NEWLINE ("\r"|"\n"|"\r\n")
 
 
 <INITIAL>["][^"]*["] {
+       char *p = yytext;
+
        /* ENCAPSULATED TC_STRING */
 
+       while ((p = strpbrk(p, "\r\n"))) {
+               if (*p == '\r' && *(p + 1) == '\n') {
+                       p++;
+               }
+               SCNG(lineno)++;
+               p++;
+       }
+
        /* eat trailing " */
        yytext[yyleng-1]=0;