Browse Source

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

fix test
experimental/5.2-WITH_DRCP
Rob Richards 19 years ago
parent
commit
d5d1801df7
  1. 5
      ext/simplexml/simplexml.c
  2. 6
      ext/simplexml/tests/bug39662.phpt

5
ext/simplexml/simplexml.c

@ -1211,7 +1211,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)) {
int bytes;
bytes = xmlSaveFile(filename, (xmlDocPtr) sxe->document->ptr);
if (bytes == -1) {
@ -1240,7 +1240,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);
@ -1762,7 +1762,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);

6
ext/simplexml/tests/bug39662.phpt

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