Skip to content

Commit 2c2af7c

Browse files
committed
Bugfix #25770 Segfault with PHP and bison 1.875
1 parent 5eb3a1d commit 2c2af7c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Zend/zend_ini_parser.y

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ string_or_value:
213213
| CFG_TRUE { $$ = $1; }
214214
| CFG_FALSE { $$ = $1; }
215215
| '\n' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
216-
| '\0' { $$.value.str.val = strdup(""); $$.value.str.len=0; $$.type = IS_STRING; }
217216
;
218217

219218
expr:

configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ if test "$YACC" != "bison -y"; then
137137
else
138138
AC_MSG_CHECKING([bison version])
139139
set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ /'|tr -d a-z`
140-
if test "${1}" = "1" -a "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75"; then
141-
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}).])
140+
if test "${1}" = "1" -a "${2}" != "28" -a "${2}" != "35" -a "${2}" != "75" -a "${2}" != "875"; then
141+
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}).])
142142
fi
143143
AC_MSG_RESULT(${1}.${2} (ok))
144144
fi

0 commit comments

Comments
 (0)