Bugfix #25770 Segfault with PHP and bison 1.875

diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index a11af70b7c98f63428cd14ec94747f74772c7726..7d8f6b649935bac17d0a497cd98285c94b3c079c 100644 (file)
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -213,7 +213,6 @@ string_or_value:
        |       CFG_TRUE { $$ = $1; }
        |       CFG_FALSE { $$ = $1; }
        |       '\n' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
-       |       '\0' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
 ;
 
 expr:

diff --git a/configure.in b/configure.in
index 7ba2d2c18ed0a44be2110a4a70f1bc59a98a2603..ddcf347132f7a575a0d47bee79cbb35014c3003f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -137,8 +137,8 @@ if test "$YACC" != "bison -y"; then
 else
     AC_MSG_CHECKING([bison version])
     set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'|tr -d a-z`
-    if test "${1}" = "1" -a "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75"; then
-      AC_MSG_WARN([You will need bison 1.28, 1.35 or 1.75 if you want to regenerate the Zend parser (found ${1}.${2}).])
+    if test "${1}" = "1" -a "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75" -a "${2}" != "875"; then
+      AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75 or 1.875 if you want to regenerate the Zend parser (found ${1}.${2}).])
     fi
     AC_MSG_RESULT(${1}.${2} (ok))
 fi