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_builtin_functions.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_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index ed8fddbfb2..0fe929627a 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1469,7 +1469,7 @@ ZEND_FUNCTION(trigger_error) ZEND_FUNCTION(set_error_handler) { zval *error_handler; - char *error_handler_name = NULL; + zend_string *error_handler_name = NULL; long error_type = E_ALL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &error_handler, &error_type) == FAILURE) { @@ -1479,11 +1479,11 @@ ZEND_FUNCTION(set_error_handler) if (Z_TYPE_P(error_handler) != IS_NULL) { /* NULL == unset */ if (!zend_is_callable(error_handler, 0, &error_handler_name TSRMLS_CC)) { zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback", - get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name:"unknown"); - efree(error_handler_name); + get_active_function_name(TSRMLS_C), error_handler_name?error_handler_name->val:"unknown"); + STR_RELEASE(error_handler_name); return; } - efree(error_handler_name); + STR_RELEASE(error_handler_name); } if (Z_TYPE(EG(user_error_handler)) != IS_UNDEF) { @@ -1536,7 +1536,7 @@ ZEND_FUNCTION(restore_error_handler) ZEND_FUNCTION(set_exception_handler) { zval *exception_handler; - char *exception_handler_name = NULL; + zend_string *exception_handler_name = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &exception_handler) == FAILURE) { return; @@ -1545,11 +1545,11 @@ ZEND_FUNCTION(set_exception_handler) if (Z_TYPE_P(exception_handler) != IS_NULL) { /* NULL == unset */ if (!zend_is_callable(exception_handler, 0, &exception_handler_name TSRMLS_CC)) { zend_error(E_WARNING, "%s() expects the argument (%s) to be a valid callback", - get_active_function_name(TSRMLS_C), exception_handler_name?exception_handler_name:"unknown"); - efree(exception_handler_name); + get_active_function_name(TSRMLS_C), exception_handler_name?exception_handler_name->val:"unknown"); + STR_RELEASE(exception_handler_name); return; } - efree(exception_handler_name); + STR_RELEASE(exception_handler_name); } if (Z_TYPE(EG(user_exception_handler)) != IS_UNDEF) { |