Fixed bug #50519 (segfault in garbage collection when using set_error_handler and...

diff --git a/NEWS b/NEWS
index 5cdc7fa5e3e94fae496308240b7a588ad62ee579..184b773e97d13514f0bf306c793faeb91f68f7b6 100644 (file)
--- 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 <stdbool.h> is valid only in a c99 compilation 

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index eb99302a71dc39ed973aa7c5eeed5faedad57554..886db0d0db424969796e315fa598bcb3d9eecb48 100644 (file)
--- 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);
 }