From: Xinchen Hui <laruence@php.net>
Date: Tue, 14 Feb 2012 05:35:34 +0000 (+0000)
Subject: Fixed bug #61072 (Memory leak when restoring an exception handler)
X-Git-Tag: php-5.5.0alpha1~535
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d683614f9ae35dfee85d6502baa22ed3bd6581b;p=php

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

diff --git a/NEWS b/NEWS
index a444fcf0e6..5a5063d5ce 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 3bfefec523..b55231d0c6 100644
--- 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();