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

diff --git a/NEWS b/NEWS
index e4f484e52d2cdce7bc73e33f93b2b04f6295ee4a..4044a2c597af5c56649919e24c5f35173df5c563 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP                                                                        NEWS
   . Fixed bug #54682 (tidy null pointer dereference). (Tony, David Soria Parra) 
 
 - 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)
   . Fix bug #60895 (Possible invalid handler usage in windows random

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 73a0a2a3d14ddf956726873381a84aba65f80e1c..8d39a31ad0cd1a31053f67bd2999dd6f11d906b2 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1516,8 +1516,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();