From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Nov 2012 10:38:18 +0000 (+0400)
Subject: Fixed bug #61557 (Crasher in tt-rss backend.php)
X-Git-Tag: php-5.4.10RC1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a09bf8023356c65a461076c6525749bdd005b58;p=php

Fixed bug #61557 (Crasher in tt-rss backend.php)
---

diff --git a/NEWS b/NEWS
index 20ef5e3bef..e8ad77a2ac 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
   . Fixed bug #63635 (Segfault in gc_collect_cycles). (Dmitry)
   . Fixed bug #63468 (wrong called method as callback with inheritance).
     (Laruence)
+  . Fixed bug #61557 (Crasher in tt-rss backend.php).
+    (i dot am dot jack dot mail at gmail dot com)
   . Fixed bug #61272 (ob_start callback gets passed empty string).
     (Mike, casper at langemeijer dot eu)
 
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index c97ee6724d..06de013858 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -860,7 +860,6 @@ static PHP_MSHUTDOWN_FUNCTION(libxml)
 {
 	if (!_php_libxml_per_request_initialization) {
 		xmlSetGenericErrorFunc(NULL, NULL);
-		xmlSetStructuredErrorFunc(NULL, NULL);
 
 		xmlParserInputBufferCreateFilenameDefault(NULL);
 		xmlOutputBufferCreateFilenameDefault(NULL);
@@ -876,11 +875,11 @@ static int php_libxml_post_deactivate()
 	/* reset libxml generic error handling */
 	if (_php_libxml_per_request_initialization) {
 		xmlSetGenericErrorFunc(NULL, NULL);
-		xmlSetStructuredErrorFunc(NULL, NULL);
 
 		xmlParserInputBufferCreateFilenameDefault(NULL);
 		xmlOutputBufferCreateFilenameDefault(NULL);
 	}
+	xmlSetStructuredErrorFunc(NULL, NULL);
 
 	if (LIBXML(stream_context)) {
 		/* the steam_context resource will be released by resource list destructor */