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

diff --git a/NEWS b/NEWS
index 20ef5e3befe6503f74e22f057ca8bcedca49ac36..e8ad77a2ac3fe736b032635f07361525e0cce9af 100644 (file)
--- 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 c97ee6724d43a2d9b918d6d54c1a51207520281d..06de013858cb84dfff00f9ebf19ccfc83a404381 100644 (file)
--- 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 */