diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-05-03 19:27:04 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-05-03 19:27:04 +0300 |
| commit | eafa92ba9d315106dede5aa154f81d0a4b34fe57 (patch) | |
| tree | f41dd0d7576592548fe636034ed2986eb3bb62e0 /Zend/zend_execute_API.c | |
| parent | fdb347a7539bde2c02b7efaae25583581c77b88e (diff) | |
| download | php-git-eafa92ba9d315106dede5aa154f81d0a4b34fe57.tar.gz | |
zend_fcall_info_cache.calling_scope is not used by zend_call_function() and doesn't have to be initialized.
It's used only as a result of zend_is_callable() in forward_static_call and spl_autoload.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 88eb4199a5..ab0459507c 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -646,13 +646,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / return FAILURE; /* we would result in an instable executor otherwise */ } - switch (fci->size) { - case sizeof(zend_fcall_info): - break; /* nothing to do currently */ - default: - zend_error_noreturn(E_CORE_ERROR, "Corrupted fcall_info provided to zend_call_function()"); - break; - } + ZEND_ASSERT(fci->size == sizeof(zend_fcall_info)); /* Initialize execute_data */ if (!EG(current_execute_data)) { @@ -954,7 +948,6 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *k fcall_info.no_separation = 1; fcall_cache.function_handler = EG(autoload_func); - fcall_cache.calling_scope = NULL; fcall_cache.called_scope = NULL; fcall_cache.object = NULL; |