Skip to content

Commit a44fb09

Browse files
committed
Merge branch 'PHP-8.1'
* PHP-8.1: Fix memory leaks
2 parents a8f8cc2 + 5bab9e9 commit a44fb09

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--TEST--
2+
call_user_func_array() with extra named parameters
3+
--FILE--
4+
<?php
5+
$args = array("" => 1);
6+
call_user_func_array("array_multisort", $args);
7+
?>
8+
--EXPECTF--
9+
Fatal error: Uncaught ArgumentCountError: array_multisort() expects at least 1 argument, 0 given in %scall_user_func_array_variadic.php:3
10+
Stack trace:
11+
#0 %scall_user_func_array_variadic.php(3): array_multisort(: 1)
12+
#1 {main}
13+
thrown in %scall_user_func_array_variadic.php on line 3

Zend/zend_compile.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3987,6 +3987,7 @@ static void zend_compile_init_user_func(zend_ast *name_ast, uint32_t num_args, z
39873987
static zend_result zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcname) /* {{{ */
39883988
{
39893989
znode arg_node;
3990+
zend_op *opline;
39903991

39913992
if (args->children != 2) {
39923993
return FAILURE;
@@ -4028,7 +4029,8 @@ static zend_result zend_compile_func_cufa(znode *result, zend_ast_list *args, ze
40284029
zend_compile_expr(&arg_node, args->child[1]);
40294030
zend_emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL);
40304031
zend_emit_op(NULL, ZEND_CHECK_UNDEF_ARGS, NULL, NULL);
4031-
zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL);
4032+
opline = zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL);
4033+
opline->extended_value = ZEND_FCALL_MAY_HAVE_EXTRA_NAMED_PARAMS;
40324034

40334035
return SUCCESS;
40344036
}

0 commit comments

Comments
 (0)