Skip to content

Commit 73c2d79

Browse files
committed
Fix memory leaks
Fixes oss-fuzz #50078
1 parent c9c51eb commit 73c2d79

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed
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

+3-1
Original file line numberDiff line numberDiff line change
@@ -3860,6 +3860,7 @@ static void zend_compile_init_user_func(zend_ast *name_ast, uint32_t num_args, z
38603860
zend_result zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_string *lcname) /* {{{ */
38613861
{
38623862
znode arg_node;
3863+
zend_op *opline;
38633864

38643865
if (args->children != 2) {
38653866
return FAILURE;
@@ -3901,7 +3902,8 @@ zend_result zend_compile_func_cufa(znode *result, zend_ast_list *args, zend_stri
39013902
zend_compile_expr(&arg_node, args->child[1]);
39023903
zend_emit_op(NULL, ZEND_SEND_ARRAY, &arg_node, NULL);
39033904
zend_emit_op(NULL, ZEND_CHECK_UNDEF_ARGS, NULL, NULL);
3904-
zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL);
3905+
opline = zend_emit_op(result, ZEND_DO_FCALL, NULL, NULL);
3906+
opline->extended_value = ZEND_FCALL_MAY_HAVE_EXTRA_NAMED_PARAMS;
39053907

39063908
return SUCCESS;
39073909
}

0 commit comments

Comments
 (0)