Fixed bug #36046 (parse_ini_file() miscounts lines in multi-line valu…

…es).
Metabolix · Jan 17, 2006 · b6cb9d3 · b6cb9d3
1 parent 52933fc
commit b6cb9d3
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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;