svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/Zend/zend_builtin_functions.c trunk/NEWS trunk/Zend/zend_builtin_functions.c

laruence Tue, 14 Feb 2012 05:35:34 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=323199 Log: Fixed bug #61072 (Memory leak when restoring an exception handler) Bug: https://bugs.php.net/61072 (Open) Memory leak when restoring an exception handler Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c U php/php-src/trunk/NEWS U php/php-src/trunk/Zend/zend_builtin_functions.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2012-02-13 20:59:33 UTC (rev 323198) +++ php/php-src/branches/PHP_5_3/NEWS 2012-02-14 05:35:34 UTC (rev 323199) @@ -9,6 +9,8 @@ . 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 Modified: php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2012-02-13 20:59:33 UTC (rev 323198) +++ php/php-src/branches/PHP_5_3/Zend/zend_builtin_functions.c 2012-02-14 05:35:34 UTC (rev 323199) @@ -1516,8 +1516,7 @@ 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(); Modified: php/php-src/trunk/NEWS =================================================================== --- php/php-src/trunk/NEWS 2012-02-13 20:59:33 UTC (rev 323198) +++ php/php-src/trunk/NEWS 2012-02-14 05:35:34 UTC (rev 323199) @@ -6,6 +6,8 @@ . 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) Modified: php/php-src/trunk/Zend/zend_builtin_functions.c =================================================================== --- php/php-src/trunk/Zend/zend_builtin_functions.c 2012-02-13 20:59:33 UTC (rev 323198) +++ php/php-src/trunk/Zend/zend_builtin_functions.c 2012-02-14 05:35:34 UTC (rev 323199) @@ -1615,8 +1615,7 @@ 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();