mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-11 10:54:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFB: correct fix for bug #39662 to fix leak and tree corruption

Browse Source 
fix test
This commit is contained in:
Rob Richards 2006-11-29 08:52:08 +00:00
parent 58698c964c
commit f799b0b19b
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/simplexml/simplexml.c
View File

@ -1232,7 +1232,7 @@ SXE_METHOD(asXML)
}
}
if (XML_DOCUMENT_NODE == node->parent->type) {
if (node->parent && (XML_DOCUMENT_NODE == node->parent->type)) {
int bytes;
bytes = xmlSaveFile(filename, (xmlDocPtr) sxe->document->ptr);
if (bytes == -1) {
@ -1265,7 +1265,7 @@ SXE_METHOD(asXML)
node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
if (node) {
if (XML_DOCUMENT_NODE == node->parent->type) {
if (node->parent && (XML_DOCUMENT_NODE == node->parent->type)) {
xmlDocDumpMemory((xmlDocPtr) sxe->document->ptr, &strval, &strval_len);
RETVAL_STRINGL((char *)strval, strval_len, 1);
xmlFree(strval);
@ -1784,7 +1784,6 @@ sxe_object_clone(void *object, void **clone_ptr TSRMLS_DC)
}
if (sxe->node) {
nodep = xmlDocCopyNode(sxe->node->node, docp, 1);
nodep->parent = sxe->node->node->parent;
}
php_libxml_increment_node_ptr((php_libxml_node_object *)clone, nodep, NULL TSRMLS_CC);

12
ext/simplexml/tests/bug39662.phpt
View File

@ -31,11 +31,9 @@ object(SimpleXMLElement)#%d (1) {
"
}
string(55) "<?xml version="1.0" encoding="utf-8"?>
<test>
string(15) "<test>
</test>
"
</test>"
Done
--UEXPECTF--
object(SimpleXMLElement)#%d (1) {
@ -50,9 +48,7 @@ object(SimpleXMLElement)#%d (1) {
"
}
string(55) "<?xml version="1.0" encoding="utf-8"?>
<test>
string(15) "<test>
</test>
"
</test>"
Done