]> granicus.if.org Git - php/commitdiff
Fixed error verbiage and free function_name on success
authorIlia Alshanetsky <iliaa@php.net>
Mon, 21 Apr 2008 14:32:57 +0000 (14:32 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Mon, 21 Apr 2008 14:32:57 +0000 (14:32 +0000)
ext/standard/basic_functions.c

index cd8ca4ab8c703b90edfd82f9ec83edcc1e599c04..12aed9f0a3b02f8d6d59ac45b0996ec1e3bd2294 100644 (file)
@@ -6062,10 +6062,12 @@ PHP_FUNCTION(register_tick_function)
        }
 
        if (!zend_is_callable(tick_fe.arguments[0], 0, &function_name)) {
-         efree(tick_fe.arguments);
-         php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid shutdown callback '%s' passed", function_name);
-         efree(function_name);
-         RETURN_FALSE;
+               efree(tick_fe.arguments);
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid tick callback '%s' passed", function_name);
+               efree(function_name);
+               RETURN_FALSE;
+       } else if (function_name) {
+               efree(function_name);
        }
 
        if (Z_TYPE_P(tick_fe.arguments[0]) != IS_ARRAY) {