Fixed bug #61072 (Memory leak when restoring an exception handler)

15 years ago · 5d683614f9
2 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@ -6,6 +6,8 @@ PHP                                                                        NEWS
  . World domination

 - Core:
+  . Fixed bug #61072 (Memory leak when restoring an exception handler).
+    (Nikic, Laruence)
  . Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical 
    vars). (Laruence)
  . Fixed bug #60978 (exit code incorrect). (Laruence)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@ -1615,8 +1615,7 @@ ZEND_FUNCTION(set_exception_handler)
 		RETURN_TRUE;
 	}

-	*EG(user_exception_handler) = *exception_handler;
-	zval_copy_ctor(EG(user_exception_handler));
+	MAKE_COPY_ZVAL(&exception_handler, EG(user_exception_handler));

 	if (!had_orig_exception_handler) {
 		RETURN_NULL();