diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-17 12:34:04 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-17 16:36:56 +0200 |
| commit | 15846ff115722b2f95d699abf07141d774b0e2cd (patch) | |
| tree | 0be3155ce95856e82c4a0cf4c694ab0c6df49e62 /ext/dom/php_dom.c | |
| parent | b516566b84c210ce6ceddeb238e45d4b1bcb32ce (diff) | |
| download | php-git-15846ff115722b2f95d699abf07141d774b0e2cd.tar.gz | |
Add ZVAL_OBJ_COPY macro
For the common ZVAL_OBJ + GC_ADDREF pattern.
This mirrors the existing ZVAL_STR_COPY API.
Diffstat (limited to 'ext/dom/php_dom.c')
| -rw-r--r-- | ext/dom/php_dom.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 9dc50ac287..c90475df1a 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -997,8 +997,7 @@ void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xml ZEND_ASSERT(basenode != NULL); - ZVAL_OBJ(&mapptr->baseobj_zv, &basenode->std); - Z_ADDREF(mapptr->baseobj_zv); + ZVAL_OBJ_COPY(&mapptr->baseobj_zv, &basenode->std); mapptr->baseobj = basenode; mapptr->nodetype = ntype; @@ -1136,8 +1135,7 @@ PHP_DOM_EXPORT zend_bool php_dom_create_object(xmlNodePtr obj, zval *return_valu } if ((intern = (dom_object *) php_dom_object_get_data((void *) obj))) { - GC_ADDREF(&intern->std); - ZVAL_OBJ(return_value, &intern->std); + ZVAL_OBJ_COPY(return_value, &intern->std); return 1; } |