archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  Fix incorrect zval type_flags in preg_replace_callback_array() for immutable arrays
This commit is contained in:
Ilija Tovilo 2023-03-31 14:42:44 +02:00
commit fced34ee1d
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/pcre/php_pcre.c
View file

@ -2438,7 +2438,12 @@ PHP_FUNCTION(preg_replace_callback_array)
}
if (subject_ht) {
RETURN_ARR(subject_ht);
RETVAL_ARR(subject_ht);
// Unset the type_flags of immutable arrays to prevent the VM from performing refcounting
if (GC_FLAGS(subject_ht) & IS_ARRAY_IMMUTABLE) {
Z_TYPE_FLAGS_P(return_value) = 0;
}
return;
} else {
RETURN_STR(subject_str);
}

11
ext/pcre/tests/gh10968.phpt Normal file
View file

@ -0,0 +1,11 @@
--TEST--
GH-10968: preg_replace_callback_array() segmentation fault
--FILE--
<?php
var_dump(preg_replace_callback_array([], []));
var_dump(preg_replace_callback_array([], ''));
?>
--EXPECT--
array(0) {
}
string(0) ""