com php-src: Fixed bug #61617 (Libxml tests failed(ht is already destroyed)): NEWS ext/libxml/libxml.c
| From: | Xinchen Hui | Date: | Wed, 04 Apr 2012 09:22:37 +0000 |
| Subject: | com php-src: Fixed bug #61617 (Libxml tests failed(ht is already destroyed)): NEWS ext/libxml/libxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-68669@lists.php.net to get a copy of this message | ||
Commit: 94f1c05ff8f83b2130de21683c5c2bd3af7e065c
Author: Xinchen Hui <laruence@php.net> Wed, 4 Apr 2012 17:22:37 +0800
Parents: ca58cd01fc329f907a13b82370427715d9c5bf70
Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=94f1c05ff8f83b2130de21683c5c2bd3af7e065c
Log:
Fixed bug #61617 (Libxml tests failed(ht is already destroyed))
Bugs:
https://bugs.php.net/61617
Changed paths:
M NEWS
M ext/libxml/libxml.c
Diff:
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));