Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix OSS-Fuzz #428983568 and #428760800
This commit is contained in:
Niels Dossche 2025-07-04 23:58:41 +02:00
commit 832dde9cb6
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 15 additions and 1 deletions

View file

@ -0,0 +1,14 @@
--TEST--
OSS-Fuzz #428983568
--FILE--
<?php
$ini = <<<INI
[\${zz:-x
INI;
var_dump(parse_ini_string($ini));
?>
--EXPECTF--
Warning: syntax error, unexpected end of file, expecting '}' in Unknown on line 1
in %s on line %d
bool(false)

View file

@ -353,7 +353,7 @@ static void normalize_value(zval *zv)
%left '|' '&' '^'
%precedence '~' '!'
%destructor { zval_ini_dtor(&$$); } TC_RAW TC_CONSTANT TC_NUMBER TC_STRING TC_WHITESPACE TC_LABEL TC_OFFSET TC_VARNAME BOOL_TRUE BOOL_FALSE NULL_NULL cfg_var_ref constant_literal constant_string encapsed_list expr option_offset section_string_or_value string_or_value var_string_list var_string_list_section
%destructor { zval_ini_dtor(&$$); } TC_RAW TC_CONSTANT TC_NUMBER TC_STRING TC_WHITESPACE TC_LABEL TC_OFFSET TC_VARNAME BOOL_TRUE BOOL_FALSE NULL_NULL cfg_var_ref constant_literal constant_string encapsed_list expr fallback option_offset section_string_or_value string_or_value var_string_list var_string_list_section
%%