diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2016-06-10 22:02:23 -0500 |
| commit | e3c681aa5cc71122a8d2fae42e6513fc413ccac8 (patch) | |
| tree | 5f1df62f7b666028edb0ee1adf083a52d63df45a /ext/dom/php_dom.c | |
| parent | fb4e3085cbaa76eb8f28eebf848a81d1c0190067 (diff) | |
| parent | 792e89385ca6fc722a03590722eb7745a2374720 (diff) | |
| download | php-git-e3c681aa5cc71122a8d2fae42e6513fc413ccac8.tar.gz | |
Merge branch 'master' into throw-error-in-extensions
Diffstat (limited to 'ext/dom/php_dom.c')
| -rw-r--r-- | ext/dom/php_dom.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 6cb198db57..c079ba5753 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2015 The PHP Group | + | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -506,7 +506,6 @@ static zend_object *dom_objects_store_clone_obj(zval *zobject) /* {{{ */ dom_object *clone = dom_objects_set_class(intern->std.ce, 0); clone->std.handlers = dom_get_obj_handlers(); - zend_objects_clone_members(&clone->std, &intern->std); if (instanceof_function(intern->std.ce, dom_node_class_entry)) { xmlNodePtr node = (xmlNodePtr)dom_object_get_node(intern); @@ -527,6 +526,8 @@ static zend_object *dom_objects_store_clone_obj(zval *zobject) /* {{{ */ } } + zend_objects_clone_members(&clone->std, &intern->std); + return &clone->std; } /* }}} */ @@ -1055,7 +1056,8 @@ void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xml { dom_nnodemap_object *mapptr = (dom_nnodemap_object *) intern->ptr; - //??? if (basenode) + ZEND_ASSERT(basenode != NULL); + ZVAL_OBJ(&mapptr->baseobj_zv, &basenode->std); Z_ADDREF(mapptr->baseobj_zv); @@ -1097,7 +1099,7 @@ zend_object *dom_objects_new(zend_class_entry *class_type) /* }}} */ #if defined(LIBXML_XPATH_ENABLED) -/* {{{ zend_object_value dom_xpath_objects_new(zend_class_entry *class_type) */ +/* {{{ zend_object dom_xpath_objects_new(zend_class_entry *class_type) */ zend_object *dom_xpath_objects_new(zend_class_entry *class_type) { dom_xpath_object *intern = ecalloc(1, sizeof(dom_xpath_object) + zend_object_properties_size(class_type)); |