From: Johannes Schlüter <johannes@php.net>
Date: Mon, 25 Jan 2010 16:46:55 +0000 (+0000)
Subject: merge -r292624: Fixed bug #50519 (segfault in garbage collection when using
X-Git-Tag: php-5.3.2RC2~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bbeb4a3687ff97f25988545ff0df4c9ae214992;p=php

merge -r292624: Fixed bug #50519 (segfault in garbage collection when using
set_error_handler and DomDocument (dmitry)
---

diff --git a/NEWS b/NEWS
index 08ac360f76..c202b7f1b3 100644
--- 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 45b0e25b18..a607faa98e 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);
 }