archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Fix OSS-Fuzz #428983568 and #428760800
This commit is contained in:
Niels Dossche 2025-07-04 23:58:33 +02:00
commit 1af7d8e547
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -10,6 +10,7 @@ PHP NEWS
order). (Daniil Gentili) order). (Daniil Gentili)
. Fixed bug GH-18907 (Leak when creating cycle in hook). (ilutov) . Fixed bug GH-18907 (Leak when creating cycle in hook). (ilutov)
. Fix OSS-Fuzz #427814456. (nielsdos) . Fix OSS-Fuzz #427814456. (nielsdos)
. Fix OSS-Fuzz #428983568 and #428760800. (nielsdos)
- Curl: - Curl:
. Fix memory leaks when returning refcounted value from curl callback. . Fix memory leaks when returning refcounted value from curl callback.

14
Zend/tests/zend_ini/oss_fuzz_428983568.phpt Normal file
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)

2
Zend/zend_ini_parser.y
View file

@ -353,7 +353,7 @@ static void normalize_value(zval *zv)
%left '|' '&' '^' %left '|' '&' '^'
%precedence '~' '!' %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
%% %%