diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 16:03:34 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 16:03:34 +0400 |
| commit | 639e4e1afac8c79d28e1a4c3df48fc060b35b68e (patch) | |
| tree | 08c72669ebe528443940264e02618b9897eee0c1 /Zend/zend_execute_API.c | |
| parent | b965647e44c4574ba4c22bfc92b5b7f587451c9d (diff) | |
| download | php-git-639e4e1afac8c79d28e1a4c3df48fc060b35b68e.tar.gz | |
Changes zend_is_callable() to use zend_string* instead of char*
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 425a04756b..794f3dc010 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -777,20 +777,20 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS } if (!fci_cache || !fci_cache->initialized) { - char *callable_name; + zend_string *callable_name; char *error = NULL; if (!fci_cache) { fci_cache = &fci_cache_local; } - if (!zend_is_callable_ex(&fci->function_name, fci->object_ptr, IS_CALLABLE_CHECK_SILENT, &callable_name, NULL, fci_cache, &error TSRMLS_CC)) { + if (!zend_is_callable_ex(&fci->function_name, fci->object_ptr, IS_CALLABLE_CHECK_SILENT, &callable_name, fci_cache, &error TSRMLS_CC)) { if (error) { - zend_error(E_WARNING, "Invalid callback %s, %s", callable_name, error); + zend_error(E_WARNING, "Invalid callback %s, %s", callable_name->val, error); efree(error); } if (callable_name) { - efree(callable_name); + STR_RELEASE(callable_name); } return FAILURE; } else if (error) { @@ -801,7 +801,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS zend_error(E_STRICT, "%s", error); efree(error); } - efree(callable_name); + STR_RELEASE(callable_name); } EX(function_state).function = fci_cache->function_handler; |