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 memory leak in array_diff() with custom type checks
This commit is contained in:
Niels Dossche
2025-11-08 22:42:33 +01:00
parent cf96153153 a0b918d3ee
commit 376fdd7afa
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ext/standard/array.c
View File

@@ -5909,6 +5909,7 @@ PHP_FUNCTION(array_diff)
for (i = 1; i < argc; i++) {
if (Z_TYPE(args[i]) != IS_ARRAY) {
zend_tmp_string_release(tmp_search_str);
zend_argument_type_error(i + 1, "must be of type array, %s given", zend_zval_value_name(&args[i]));
RETURN_THROWS();
}

14
ext/standard/tests/array/array_diff_leak_custom_type_checks.phpt Normal file
View File

@@ -0,0 +1,14 @@
--TEST--
array_diff() memory leak with custom type checks
--FILE--
<?php
try {
array_diff([123], 'x');
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
array_diff(): Argument #2 must be of type array, string given