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

laruence · laruence · commit 5d683614f9ae · 2012-02-14T05:35:34.000Z
diff --git 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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -1615,8 +1615,7 @@ ZEND_FUNCTION(set_exception_handler)`
`1615`	`1615`	`RETURN_TRUE;`
`1616`	`1616`	`}`
`1617`	`1617`
`1618`		`- EG(user_exception_handler) = exception_handler;`
`1619`		`- zval_copy_ctor(EG(user_exception_handler));`
	`1618`	`+ MAKE_COPY_ZVAL(&exception_handler, EG(user_exception_handler));`
`1620`	`1619`
`1621`	`1620`	`if (!had_orig_exception_handler) {`
`1622`	`1621`	`RETURN_NULL();`