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.4'

Browse Source 
* PHP-8.4:
  Fix GH-17216: Trampoline crash on error
This commit is contained in:
Niels Dossche
2024-12-21 00:26:37 +01:00
parent c4bb6e6c39 627432785e
commit afc1f0d99b
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Zend/tests/named_params/gh17216.phpt Normal file
View File

@@ -0,0 +1,22 @@
--TEST--
GH-17216 (Trampoline crash on error)
--FILE--
<?php
class TrampolineTest {
public function __call(string $name, array $arguments) {
var_dump($name, $arguments);
}
}
$o = new TrampolineTest();
$callback = [$o, 'trampoline'];
$array = ["a" => "b", 1];
try {
forward_static_call_array($callback, $array);
} catch (Error $e) {
echo $e->getMessage(), "\n";
}
echo "Done\n";
?>
--EXPECT--
Cannot use positional argument after named argument
Done

4
Zend/zend_execute_API.c
View File

@@ -884,7 +884,11 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
ZEND_CALL_NUM_ARGS(call) = i; ZEND_CALL_NUM_ARGS(call) = i;
cleanup_args: cleanup_args:
zend_vm_stack_free_args(call); zend_vm_stack_free_args(call);
if (ZEND_CALL_INFO(call) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS) {
zend_free_extra_named_params(call->extra_named_params);
}
zend_vm_stack_free_call_frame(call); zend_vm_stack_free_call_frame(call);
zend_release_fcall_info_cache(fci_cache);
return SUCCESS; return SUCCESS;
} }
} }