From db8e4a089c656907bd20bf33258399d4f89fe87e Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Fri, 25 Dec 2009 13:11:18 +0000 Subject: [PATCH] Fixed bug #50519 (segfault in garbage collection when using set_error_handler and DomDocument) --- NEWS | 2 ++ Zend/zend_variables.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 5cdc7fa5e3..184b773e97 100644 --- a/NEWS +++ b/NEWS @@ -47,6 +47,8 @@ PHP NEWS - 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 is valid only in a c99 compilation diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index eb99302a71..886db0d0db 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -160,6 +160,9 @@ ZEND_API void _zval_copy_ctor_wrapper(zval *zvalue) ZEND_API void _zval_dtor_wrapper(zval *zvalue) { + TSRMLS_FETCH(); + + GC_REMOVE_ZVAL_FROM_BUFFER(zvalue); zval_dtor(zvalue); } -- 2.40.0