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

Check variadic parameter for type and duplicate name

Browse source 
Set HAS_TYPE_HINTS flag if the variadic parameter is types as well,
and make sure it has a distinct name. This was previously missed,
because the variadic parameter is not part of num_args.
This commit is contained in:
Nikita Popov 2020-08-24 10:15:57 +02:00
parent 2c2bb50984
commit 9395e01e3d
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Zend/zend_API.c
View file

@ -2371,10 +2371,16 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
break; break;
} }
/* Get parameter count including variadic parameter. */
uint32_t num_args = reg_function->common.num_args;
if (reg_function->common.fn_flags & ZEND_ACC_VARIADIC) {
num_args++;
}
/* If types of arguments have to be checked */ /* If types of arguments have to be checked */
if (reg_function->common.arg_info && reg_function->common.num_args) { if (reg_function->common.arg_info && num_args) {
uint32_t i; uint32_t i;
for (i = 0; i < reg_function->common.num_args; i++) { for (i = 0; i < num_args; i++) {
zend_internal_arg_info *arg_info = &reg_function->internal_function.arg_info[i]; zend_internal_arg_info *arg_info = &reg_function->internal_function.arg_info[i];
ZEND_ASSERT(arg_info->name && "Parameter must have a name"); ZEND_ASSERT(arg_info->name && "Parameter must have a name");
if (ZEND_TYPE_IS_SET(arg_info->type)) { if (ZEND_TYPE_IS_SET(arg_info->type)) {
@ -2396,13 +2402,11 @@ ZEND_API int zend_register_functions(zend_class_entry *scope, const zend_functio
(reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { (reg_function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) {
/* convert "const char*" class type names into "zend_string*" */ /* convert "const char*" class type names into "zend_string*" */
uint32_t i; uint32_t i;
uint32_t num_args = reg_function->common.num_args + 1;
zend_arg_info *arg_info = reg_function->common.arg_info - 1; zend_arg_info *arg_info = reg_function->common.arg_info - 1;
zend_arg_info *new_arg_info; zend_arg_info *new_arg_info;
if (reg_function->common.fn_flags & ZEND_ACC_VARIADIC) { /* Treat return type as an extra argument */
num_args++; num_args++;
}
new_arg_info = malloc(sizeof(zend_arg_info) * num_args); new_arg_info = malloc(sizeof(zend_arg_info) * num_args);
memcpy(new_arg_info, arg_info, sizeof(zend_arg_info) * num_args); memcpy(new_arg_info, arg_info, sizeof(zend_arg_info) * num_args);
reg_function->common.arg_info = new_arg_info + 1; reg_function->common.arg_info = new_arg_info + 1;