archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Xinchen Hui 2012-02-14 05:35:34 +00:00
parent e78aa1b3b4
commit 5d683614f9
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -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)

3
Zend/zend_builtin_functions.c
View file

@ -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();