diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-27 16:09:58 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-27 16:14:51 +0200 |
| commit | 31ce1cbbb9296d11bdcf44e141d26d95f82c17fc (patch) | |
| tree | bf6f6b1349b0b699f7cfd5eeacf19f3335787eab | |
| parent | 209b12e06491373314bdb245fd85e21dabe4b745 (diff) | |
| download | php-git-31ce1cbbb9296d11bdcf44e141d26d95f82c17fc.tar.gz | |
Func info: Fix calls to zero-arg varargs
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.
| -rw-r--r-- | ext/opcache/Optimizer/zend_func_info.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index 894c42dcee..0908d1da1f 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -1688,8 +1688,9 @@ int zend_func_info_rid = -1; uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa) { uint32_t ret = 0; + const zend_function *callee_func = call_info->callee_func; - if (call_info->callee_func->type == ZEND_INTERNAL_FUNCTION) { + if (callee_func->type == ZEND_INTERNAL_FUNCTION) { zval *zv; func_info_t *info; @@ -1700,9 +1701,10 @@ uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa ret = MAY_BE_NULL; } else if (info->info_func) { ret = info->info_func(call_info, ssa); - } else if (/*call_info->callee_func->common.arg_info && */ - call_info->callee_func->common.num_args == 0 && - call_info->callee_func->common.required_num_args == 0) { + } else if (/*callee_func->common.arg_info && */ + callee_func->common.num_args == 0 && + callee_func->common.required_num_args == 0 && + !(callee_func->common.fn_flags & ZEND_ACC_VARIADIC)) { if (call_info->num_args == 0) { ret = info->info; } else { @@ -1718,19 +1720,19 @@ uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa } } else { // FIXME: the order of functions matters!!! - zend_func_info *info = ZEND_FUNC_INFO((zend_op_array*)call_info->callee_func); + zend_func_info *info = ZEND_FUNC_INFO((zend_op_array*)callee_func); if (info) { ret = info->return_info.type; } } if (!ret) { ret = MAY_BE_ANY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_ANY | MAY_BE_ARRAY_OF_REF; - if (call_info->callee_func->type == ZEND_INTERNAL_FUNCTION) { + if (callee_func->type == ZEND_INTERNAL_FUNCTION) { ret |= FUNC_MAY_WARN; } - if (call_info->callee_func->common.fn_flags & ZEND_ACC_GENERATOR) { + if (callee_func->common.fn_flags & ZEND_ACC_GENERATOR) { ret = MAY_BE_RC1 | MAY_BE_RCN | MAY_BE_OBJECT; - } else if (call_info->callee_func->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) { + } else if (callee_func->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) { ret |= MAY_BE_REF; } else { ret |= MAY_BE_RC1 | MAY_BE_RCN; |