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 /main/SAPI.c | |
| parent | b965647e44c4574ba4c22bfc92b5b7f587451c9d (diff) | |
| download | php-git-639e4e1afac8c79d28e1a4c3df48fc060b35b68e.tar.gz | |
Changes zend_is_callable() to use zend_string* instead of char*
Diffstat (limited to 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 4f61e3a93c..2b8b1826da 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -129,18 +129,15 @@ SAPI_API void sapi_free_header(sapi_header_struct *sapi_header) PHP_FUNCTION(header_register_callback) { zval *callback_func; - char *callback_name; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &callback_func) == FAILURE) { return; } - if (!zend_is_callable(callback_func, 0, &callback_name TSRMLS_CC)) { - efree(callback_name); + if (!zend_is_callable(callback_func, 0, NULL TSRMLS_CC)) { RETURN_FALSE; } - efree(callback_name); - if (Z_TYPE(SG(callback_func)) != IS_UNDEF) { zval_ptr_dtor(&SG(callback_func)); SG(fci_cache) = empty_fcall_info_cache; @@ -156,11 +153,10 @@ static void sapi_run_header_callback(TSRMLS_D) { int error; zend_fcall_info fci; - char *callback_name = NULL; char *callback_error = NULL; zval retval; - if (zend_fcall_info_init(&SG(callback_func), 0, &fci, &SG(fci_cache), &callback_name, &callback_error TSRMLS_CC) == SUCCESS) { + if (zend_fcall_info_init(&SG(callback_func), 0, &fci, &SG(fci_cache), NULL, &callback_error TSRMLS_CC) == SUCCESS) { fci.retval = &retval; error = zend_call_function(&fci, &SG(fci_cache) TSRMLS_CC); @@ -174,9 +170,6 @@ callback_failed: php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not call the sapi_header_callback"); } - if (callback_name) { - efree(callback_name); - } if (callback_error) { efree(callback_error); } |