Permalink
Browse files

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

  • Loading branch information...
1 parent f877d7f commit 1a09bf8023356c65a461076c6525749bdd005b58 @dstogov dstogov committed Nov 29, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −0 NEWS
  2. +1 −2 ext/libxml/libxml.c
View
2 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)
View
3 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 */

0 comments on commit 1a09bf8

Please sign in to comment.