MFH: Fixed bug #28804 (ini-file section parsing pattern is buggy).

diff --git a/NEWS b/NEWS
index 4d5e256ee6bde951979f39be853ab788907afda9..c790a532882bc6f3cf77473573cf6e1b9f5c947a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -87,6 +87,8 @@ PHP                                                                        NEWS
   (Jani)
 - Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
   (eggert at gnu dot org, Jani)
+- Fixed bug #28804 (ini-file section parsing pattern is buggy).
+  (wendland at scan-plus dot de)
 - Fixed bug #28451 (corupt EXIF headers have unlimited recursive IFD directory
   entries). (Andrei)
 - Fixed bug #28444 (Cannot access undefined property for object with overloaded

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 4a096f44df1a2fcc3fbdaaae2cc716c666af782e..7f23746e7a8f5add73478286f4a566d5d708fcfb 100644 (file)
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -116,7 +116,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
        return CFG_FALSE;
 }
 
-<INITIAL>[[][^[]+[\]][ ]*{NEWLINE}? {
+<INITIAL>\[[^\]\[]+\][ ]*{NEWLINE}? {
        /* SECTION */
 
        /* eat trailing ] and spaces */