cvs: ZendEngine2(PHP_5_3) / zend_execute_API.c

dmitry		Sat Jul 26 19:14:38 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_execute_API.c 
  Log:
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.48&r2=1.331.2.20.2.24.2.49&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.48 ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.49
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.48	Sat Jul 26 18:32:20 2008
+++ ZendEngine2/zend_execute_API.c	Sat Jul 26 19:14:38 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.48 2008/07/26 18:32:20 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.49 2008/07/26 19:14:38 dmitry Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -734,7 +734,9 @@
 				zend_error(E_WARNING, "Invalid callback %s, %s", callable_name, error);
 				efree(error);
 			}
-			efree(callable_name);
+			if (callable_name) {
+				efree(callable_name);
+			}
 			return FAILURE;
 		} else if (error) {
 			/* Capitalize the first latter of the error message */
@@ -744,9 +746,7 @@
 			zend_error(E_STRICT, "%s", error);
 			efree(error);
 		}
-		if (callable_name) {
-			efree(callable_name);
-		}
+		efree(callable_name);
 	}
 
 	EX(function_state).function = fci_cache->function_handler;



-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php