summaryrefslogtreecommitdiff
path: root/ext/dom/php_dom.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-04-17 23:29:35 +0200
committerNikita Popov <nikic@php.net>2014-04-18 00:15:13 +0200
commit59d45e69f4a24935719230cea3d25a0c9701511e (patch)
tree7539f4129cec3c7c872c9eeb269133e1c02e11d8 /ext/dom/php_dom.c
parent3434d3fc98881ee5cd45b2b57afc789fd69b810b (diff)
downloadphp-git-59d45e69f4a24935719230cea3d25a0c9701511e.tar.gz
Fix libxml/sxe/dom node import/export
Also fix sxe zts.
Diffstat (limited to 'ext/dom/php_dom.c')
-rw-r--r--ext/dom/php_dom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index c51be7f66c..99d99e236f 100644
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -477,7 +477,7 @@ void *php_dom_export_node(zval *object TSRMLS_DC) /* {{{ */
php_libxml_node_object *intern;
xmlNodePtr nodep = NULL;
- intern = Z_DOMOBJ_P(object);
+ intern = (php_libxml_node_object *) Z_DOMOBJ_P(object);
if (intern->node) {
nodep = intern->node->node;
}
@@ -499,7 +499,7 @@ PHP_FUNCTION(dom_import_simplexml)
return;
}
- nodeobj = Z_DOMOBJ_P(node);
+ nodeobj = (php_libxml_node_object *) ((char *) Z_OBJ_P(node) - Z_OBJ_HT_P(node)->offset);
nodep = php_libxml_import_node(node TSRMLS_CC);
if (nodep && nodeobj && (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE)) {