summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-04-04 09:22:37 (GMT)
committerXinchen Hui <laruence@php.net>2012-04-04 09:22:37 (GMT)
commit94f1c05ff8f83b2130de21683c5c2bd3af7e065c (patch)
tree6351db88cec93be7d5dce64ff7fa694fbcdb1c72
parentca58cd01fc329f907a13b82370427715d9c5bf70 (diff)
downloadphp-94f1c05ff8f83b2130de21683c5c2bd3af7e065c.tar.gz
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
-rw-r--r--NEWS2
-rw-r--r--ext/libxml/libxml.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cfa1dba..8d5afeb 100644
--- 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)
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 515d58e..a178478 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -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));