From 04da0582846db07dde5b6e5242ca80df9ea109cf Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 15 Sep 2006 09:12:17 +0000 Subject: MFH: fix leak when call to shutdown function fails --- ext/standard/basic_functions.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'ext/standard/basic_functions.c') diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index f59920f1b4..236fbd0106 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5224,18 +5224,20 @@ static int user_shutdown_function_call(php_shutdown_function_entry *shutdown_fun if (!zend_is_callable(shutdown_function_entry->arguments[0], 0, &function_name)) { php_error(E_WARNING, "(Registered shutdown functions) Unable to call %s() - function does not exist", function_name); - } else if (call_user_function(EG(function_table), NULL, - shutdown_function_entry->arguments[0], - &retval, - shutdown_function_entry->arg_count - 1, - shutdown_function_entry->arguments + 1 - TSRMLS_CC ) == SUCCESS) + efree(function_name); + return 0; + } + efree(function_name); + + if (call_user_function(EG(function_table), NULL, + shutdown_function_entry->arguments[0], + &retval, + shutdown_function_entry->arg_count - 1, + shutdown_function_entry->arguments + 1 + TSRMLS_CC ) == SUCCESS) { zval_dtor(&retval); } - if (function_name) { - efree(function_name); - } return 0; } -- cgit v1.2.1