merge -r292624: Fixed bug #50519 (segfault in garbage collection when using

set_error_handler and DomDocument (dmitry)

diff --git a/NEWS b/NEWS
index 08ac360f768104e669d0c69d86e0181a29aec77d..c202b7f1b3aabe0cfe28405749889a6bdc12753e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,8 @@ PHP                                                                        NEWS
 
 - 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 45b0e25b187fc19499fb20e203b184e896e512a1..a607faa98ebb79600daf339f18569f4aa97c94d2 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);
 }