diff options
| author | Rob Richards <rrichards@php.net> | 2004-02-17 11:13:47 +0000 |
|---|---|---|
| committer | Rob Richards <rrichards@php.net> | 2004-02-17 11:13:47 +0000 |
| commit | ec2ea131fbee3bfe682eafcd75ff87ae550d8ad6 (patch) | |
| tree | 896b392a8ab2729032d34e68f8dc1adb9a91bc42 /ext/dom/node.c | |
| parent | 0ecd198dc5b4a7328020c02b1147bd5eab593eb3 (diff) | |
| download | php-git-ec2ea131fbee3bfe682eafcd75ff87ae550d8ad6.tar.gz | |
implement clone functionality to fix segfault
DomNode->clone() creates new doc proxy if document is cloned
remove printf from xpath
fix remaining invalid object state issues
Diffstat (limited to 'ext/dom/node.c')
| -rw-r--r-- | ext/dom/node.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ext/dom/node.c b/ext/dom/node.c index d6843364fa..d052952bfa 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -1291,9 +1291,13 @@ PHP_FUNCTION(dom_node_clone_node) node = xmlDocCopyNode(n, n->doc, recursive); + if (!node) { + RETURN_FALSE; + } + /* When deep is false Element nodes still require the attributes Following taken from libxml as xmlDocCopyNode doesnt do this */ - if (node && n->type == XML_ELEMENT_NODE && recursive == 0) { + if (n->type == XML_ELEMENT_NODE && recursive == 0) { if (n->nsDef != NULL) { node->nsDef = xmlCopyNamespaceList(n->nsDef); } @@ -1319,8 +1323,9 @@ PHP_FUNCTION(dom_node_clone_node) } } - if (!node) { - RETURN_FALSE; + /* If document cloned we want a new document proxy */ + if (node->doc != n->doc) { + intern = NULL; } DOM_RET_OBJ(rv, node, &ret, intern); |