Skip to content

Commit 29855cc

Browse files
committed
Added compile-time check for default passed beyond parameter limit.
1 parent 921f482 commit 29855cc

File tree

5 files changed

+26
-8
lines changed

5 files changed

+26
-8
lines changed

Zend/tests/default_expression/required_parameter_of_internal_class.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ DateTime::createFromInterface(default);
77
?>
88
--EXPECTF--
99
Fatal error: Uncaught ValueError: Cannot pass default to required parameter 1 of DateTime::createFromInterface() in %s:%d
10-
Stack trace:%a
10+
Stack trace:
11+
%a

Zend/tests/default_expression/required_parameter_of_internal_function.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ json_encode(default);
77
?>
88
--EXPECTF--
99
Fatal error: Uncaught ValueError: Cannot pass default to required parameter 1 of json_encode() in %s:%d
10-
Stack trace:%a
10+
Stack trace:
11+
%a
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--TEST--
2+
Tests passing default beyond the maximum parameters specified by the function
3+
--FILE--
4+
<?php
5+
6+
function F() {}
7+
F(default);
8+
?>
9+
--EXPECTF--
10+
Fatal error: Uncaught ValueError: Cannot pass default to undeclared parameter 1 of F() in %s:%d
11+
Stack trace:
12+
%a

Zend/zend_vm_def.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9821,11 +9821,11 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_DEFAULT_ARG, UNUSED|NUM, UNUSED)
98219821
reflection_parameter_reference param;
98229822
param.offset = opline->op1.num - 1;
98239823
param.required = param.offset < called_func->common.required_num_args;
9824-
param.arg_info = &called_func->common.arg_info[param.offset];
98259824
param.fptr = called_func;
98269825

9827-
if (param.required) {
9828-
zend_value_error("Cannot pass default to required parameter %u of %s%s%s()",
9826+
if (UNEXPECTED(param.required || param.offset >= called_func->common.num_args)) {
9827+
zend_value_error("Cannot pass default to %s parameter %u of %s%s%s()",
9828+
param.required ? "required" : "undeclared",
98299829
opline->op1.num,
98309830
called_func->common.scope ? ZSTR_VAL(called_func->common.scope->name) : "",
98319831
called_func->common.scope ? "::" : "",
@@ -9834,6 +9834,8 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_DEFAULT_ARG, UNUSED|NUM, UNUSED)
98349834
HANDLE_EXCEPTION();
98359835
}
98369836

9837+
param.arg_info = &called_func->common.arg_info[param.offset];
9838+
98379839
zval default_value;
98389840
reflection_get_parameter_default(&default_value, &param);
98399841

Zend/zend_vm_execute.h

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)