iliaa Mon Apr 21 14:32:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
Log:
Fixed error verbiage and free function_name on success
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.28&r2=1.725.2.31.2.64.2.29&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.28
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.29
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.28 Sun Apr 20
15:07:39 2008
+++ php-src/ext/standard/basic_functions.c Mon Apr 21 14:32:57 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.28 2008/04/20 15:07:39 iliaa Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.29 2008/04/21 14:32:57 iliaa Exp
$ */
#include "php.h"
#include "php_streams.h"
@@ -6062,10 +6062,12 @@
}
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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
