php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Fix GH-20695: Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string()
This commit is contained in:
Niels Dossche
2025-12-15 22:47:12 +01:00
parent eb88c0a496 21fe7149e7
commit 2ef60d07ae
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_ini_scanner.l
View File

@@ -145,10 +145,10 @@ ZEND_API zend_ini_scanner_globals ini_scanner_globals;
if (SCNG(scanner_mode) == ZEND_INI_SCANNER_TYPED && \
(YYSTATE == STATE(ST_VALUE) || YYSTATE == STATE(ST_RAW))) {\
zend_ini_copy_typed_value(ini_lval, type, str, len); \
Z_EXTRA_P(ini_lval) = 0; \
} else { \
zend_ini_copy_value(ini_lval, str, len); \
} \
Z_EXTRA_P(ini_lval) = 0; \
return type; \
}

14
ext/standard/tests/gh20695.phpt Normal file
View File

@@ -0,0 +1,14 @@
--TEST--
GH-20695 (Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string())
--FILE--
<?php
var_dump(parse_ini_string('8 [[] = !!$]', true, INI_SCANNER_TYPED));
?>
--EXPECT--
array(1) {
[8]=>
array(1) {
["["]=>
int(0)
}
}