svn: /php/php-src/branches/PHP_5_3_2/ NEWS Zend/zend_variables.c

johannes Mon, 25 Jan 2010 16:46:55 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=294000 Log: merge -r292624: Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument (dmitry) Bug: http://bugs.php.net/50519 (Closed) segfault in garbage collection when using set_error_handler and DomDocument Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/NEWS U php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_3_2/NEWS 2010-01-25 16:30:38 UTC (rev 293999) +++ php/php-src/branches/PHP_5_3_2/NEWS 2010-01-25 16:46:55 UTC (rev 294000) @@ -46,6 +46,8 @@ - Fixed bug #50540 (Crash while running ldap_next_reference test cases). (Sriram) +- Fixed bug #50519 (segfault in garbage collection when using set_error_handler + and DomDocument). (Dmitry) - Fixed bug #50508 (compile failure: Conflicting HEADER type declarations). (Jani) - Fixed bug #50496 (Use of <stdbool.h> is valid only in a c99 compilation Modified: php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c =================================================================== --- php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c 2010-01-25 16:30:38 UTC (rev 293999) +++ php/php-src/branches/PHP_5_3_2/Zend/zend_variables.c 2010-01-25 16:46:55 UTC (rev 294000) @@ -160,6 +160,9 @@ ZEND_API void _zval_dtor_wrapper(zval *zvalue) { + TSRMLS_FETCH(); + + GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); zval_dtor(zvalue); }