svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/zend_builtin_functions.c trunk/NEWS
| From: | Xinchen Hui | Date: | Fri, 02 Mar 2012 02:56:08 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/zend_builtin_functions.c trunk/NEWS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67780@lists.php.net to get a copy of this message | ||
laruence Fri, 02 Mar 2012 02:56:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323766
Log:
MFH: Fixed bug #61072 (Memory leak when restoring an exception handler).
Bug: https://bugs.php.net/61072 (Assigned) Memory leak when
restoring an exception handler
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
U php/php-src/trunk/NEWS
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-02 02:51:57 UTC (rev 323765)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-02 02:56:08 UTC (rev 323766)
@@ -5,6 +5,8 @@
- Core:
. Fixed bug #61225 (Incorect lexing of 0b00*+<NUM>). (Pierrick)
. Fixed bug #61165 (Segfault - strip_tags()). (Laruence)
+ . Fixed bug #61072 (Memory leak when restoring an exception handler).
+ (Nikic, Laruence)
- Standard:
. Fixed memory leak in substr_replace. (Pierrick)
Modified: php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2012-03-02 02:51:57 UTC (rev 323765)
+++ php/php-src/branches/PHP_5_4/Zend/zend_builtin_functions.c 2012-03-02 02:56:08 UTC (rev 323766)
@@ -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();
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2012-03-02 02:51:57 UTC (rev 323765)
+++ php/php-src/trunk/NEWS 2012-03-02 02:56:08 UTC (rev 323766)
@@ -6,8 +6,6 @@
. World domination
- Core:
- . Fixed bug #61072 (Memory leak when restoring an exception handler).
- (Nikic, Laruence)
. Fixed bug #61011 (Crash when an exception is thrown by __autoload
accessing a static property). (Laruence)
. Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical