]> granicus.if.org Git - php/commitdiff
Fixed bug #61557 (Crasher in tt-rss backend.php)
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Nov 2012 10:41:20 +0000 (14:41 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Nov 2012 10:41:20 +0000 (14:41 +0400)
ext/libxml/libxml.c

index c97ee6724d43a2d9b918d6d54c1a51207520281d..06de013858cb84dfff00f9ebf19ccfc83a404381 100644 (file)
@@ -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 */