From 5d683614f9ae35dfee85d6502baa22ed3bd6581b Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 14 Feb 2012 05:35:34 +0000 Subject: Fixed bug #61072 (Memory leak when restoring an exception handler) --- Zend/zend_builtin_functions.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Zend/zend_builtin_functions.c') 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(); -- cgit v1.2.1