dmitry Fri, 25 Dec 2009 13:11:18 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=292624
Log: Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument) Bug: http://bugs.php.net/50519 (Assigned) segfault in garbage collection when using set_error_handler and DomDocument Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/Zend/zend_variables.c U php/php-src/trunk/Zend/zend_variables.c Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-12-25 10:02:47 UTC (rev 292623) +++ php/php-src/branches/PHP_5_3/NEWS 2009-12-25 13:11:18 UTC (rev 292624) @@ -47,6 +47,8 @@ - Fixed bug #50558 (Broken object model when extending tidy). (Pierrick) - 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/Zend/zend_variables.c =================================================================== --- php/php-src/branches/PHP_5_3/Zend/zend_variables.c 2009-12-25 10:02:47 UTC (rev 292623) +++ php/php-src/branches/PHP_5_3/Zend/zend_variables.c 2009-12-25 13:11:18 UTC (rev 292624) @@ -160,6 +160,9 @@ ZEND_API void _zval_dtor_wrapper(zval *zvalue) { + TSRMLS_FETCH(); + + GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); zval_dtor(zvalue); } Modified: php/php-src/trunk/Zend/zend_variables.c =================================================================== --- php/php-src/trunk/Zend/zend_variables.c 2009-12-25 10:02:47 UTC (rev 292623) +++ php/php-src/trunk/Zend/zend_variables.c 2009-12-25 13:11:18 UTC (rev 292624) @@ -180,6 +180,9 @@ ZEND_API void _zval_dtor_wrapper(zval *zvalue) /* {{{ */ { + TSRMLS_FETCH(); + + GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); zval_dtor(zvalue); } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
