diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:01:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:01:25 +0400 |
| commit | 412ad4b25417d261c0a8c43f788d5c110593d891 (patch) | |
| tree | 43a257a7d074bf976c02d0d35da80fde24f54705 /Zend/zend_execute.c | |
| parent | 0b1cfdf390632a0bf0b27516399b09813500c299 (diff) | |
| download | php-git-412ad4b25417d261c0a8c43f788d5c110593d891.tar.gz | |
Uinified call frame handling for user and internal functions.
Now EG(current_execute_data) always point to the call frame of the currently executed function.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 5318bbe2d3..1500640f9b 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -546,7 +546,7 @@ ZEND_API void zend_verify_arg_error(int error_type, const zend_function *zf, zen ZVAL_UNDEF(arg); } - if (ptr && ptr->func && ZEND_USER_CODE(ptr->func->common.type)) { + if (zf->common.type == ZEND_USER_FUNCTION && ptr && ptr->func && ZEND_USER_CODE(ptr->func->common.type)) { zend_error(error_type, "Argument %d passed to %s%s%s() must %s%s, %s%s given, called in %s on line %d and defined", arg_num, fclass, fsep, fname, need_msg, need_kind, given_msg, given_kind, ptr->func->op_array.filename->val, ptr->opline->lineno); } else { zend_error(error_type, "Argument %d passed to %s%s%s() must %s%s, %s%s given", arg_num, fclass, fsep, fname, need_msg, need_kind, given_msg, given_kind); |