]> granicus.if.org Git - php/commitdiff
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
authorXinchen Hui <laruence@php.net>
Wed, 4 Apr 2012 09:22:37 +0000 (17:22 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 4 Apr 2012 09:22:37 +0000 (17:22 +0800)
NEWS
ext/libxml/libxml.c

diff --git a/NEWS b/NEWS
index cfa1dba9d25f8372fd20d7dd83fb56b3046d9c78..8d5afeb30d6d32c3b0bda190ef1c416fc2c2019c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -68,6 +68,8 @@ PHP                                                                        NEWS
   . Fixed bug #60802 (ibase_trans() gives segfault when passing params).
 
 - Libxml:
+  . Fixed bug #61617 (Libxml tests failed(ht is already destroyed)).
+    (Laruence)
   . Fixed bug #61367 (open_basedir bypass using libxml RSHUTDOWN). 
     (Tim Starling)
 
index 515d58ea6ad376df150a56f744d23d42491d4510..a17847868a523cf103e22a6b3c58f7d239690c4b 100644 (file)
@@ -666,7 +666,8 @@ static int php_libxml_post_deactivate()
        xmlOutputBufferCreateFilenameDefault(NULL);
 
        if (LIBXML(stream_context)) {
-               zval_ptr_dtor(&LIBXML(stream_context));
+               /* the steam_context resource will be released by resource list destructor */
+               efree(LIBXML(stream_context));
                LIBXML(stream_context) = NULL;
        }
        smart_str_free(&LIBXML(error_buffer));