cvs: php-src /ext/dom attr.c element.c php_dom.c

rrichards Wed May 3 08:40:52 2006 UTC Modified files: /php-src/ext/dom php_dom.c attr.c element.c Log: Fix bug #37277 (cloning Dom Documents or Nodes does not work) Proper fix for bug #36859 http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.93&r2=1.94&diff_format=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.93 php-src/ext/dom/php_dom.c:1.94 --- php-src/ext/dom/php_dom.c:1.93 Wed Mar 29 15:08:52 2006 +++ php-src/ext/dom/php_dom.c Wed May 3 08:40:52 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.93 2006/03/29 15:08:52 tony2001 Exp $ */ +/* $Id: php_dom.c,v 1.94 2006/05/03 08:40:52 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -460,7 +460,6 @@ retval.handle = zend_objects_store_put(new_object, obj->dtor, obj->free_storage, obj->clone TSRMLS_CC); intern = (dom_object *) new_object; intern->handle = retval.handle; - intern->ptr = NULL; retval.handlers = Z_OBJ_HT_P(zobject); old_object = (dom_object *) obj->object; http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/attr.c?r1=1.22&r2=1.23&diff_format=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.22 php-src/ext/dom/attr.c:1.23 --- php-src/ext/dom/attr.c:1.22 Mon Feb 13 10:23:57 2006 +++ php-src/ext/dom/attr.c Wed May 3 08:40:52 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.22 2006/02/13 10:23:57 dmitry Exp $ */ +/* $Id: attr.c,v 1.23 2006/05/03 08:40:52 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -77,7 +77,7 @@ } if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); } http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/element.c?r1=1.42&r2=1.43&diff_format=u Index: php-src/ext/dom/element.c diff -u php-src/ext/dom/element.c:1.42 php-src/ext/dom/element.c:1.43 --- php-src/ext/dom/element.c:1.42 Mon Feb 13 10:23:57 2006 +++ php-src/ext/dom/element.c Wed May 3 08:40:52 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: element.c,v 1.42 2006/02/13 10:23:57 dmitry Exp $ */ +/* $Id: element.c,v 1.43 2006/05/03 08:40:52 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -128,7 +128,7 @@ intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC); if (intern != NULL) { - oldnode = (xmlNodePtr)intern->ptr; + oldnode = dom_object_get_node(intern); if (oldnode != NULL) { php_libxml_node_free_resource(oldnode TSRMLS_CC); }