Patch another_fix_for_bug61767.patch for Scripting Engine problem Bug #61767

Patch version 2012-04-20 09:50 UTC

• 2012-04-20 09:50 UTC [diff to current]

Developer: laruence@php.net

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 528e4f6..45b0aff 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -4973,6 +4973,12 @@ static int user_shutdown_function_call(php_shutdown_function_entry *shutdown_fun
 		efree(function_name);
 	}
 
+	if (EG(exception)) {
+	    /* @FIXME: see #61767 and #60909 */
+		zval_ptr_dtor(&EG(exception));
+		EG(exception) = NULL;
+	}
+
 	if (call_user_function(EG(function_table), NULL,
 				shutdown_function_entry->arguments[0],
 				&retval,