]> granicus.if.org Git - php/commitdiff
*** empty log message ***
authorDmitry Stogov <dmitry@php.net>
Sat, 26 Jul 2008 19:14:38 +0000 (19:14 +0000)
committerDmitry Stogov <dmitry@php.net>
Sat, 26 Jul 2008 19:14:38 +0000 (19:14 +0000)
Zend/zend_execute_API.c

index ed57d740afabbd74097139e5c57e323a4b5859b6..b5cea12fc12a023a5f9cdd03395b5a0e08d1dbde 100644 (file)
@@ -734,7 +734,9 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                                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 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                        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;