Skip to content

Commit 4fadf64

Browse files
committed
Refactor dom_nnodemap_objects_new()
- Use ecalloc() to not miss initializing any field. - Merge declarations and assignments.
1 parent 89934b4 commit 4fadf64

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

ext/dom/php_dom.c

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,26 +1603,10 @@ void dom_nnodemap_objects_free_storage(zend_object *object) /* {{{ */
16031603

16041604
zend_object *dom_nnodemap_objects_new(zend_class_entry *class_type)
16051605
{
1606-
dom_object *intern;
1607-
dom_nnodemap_object *objmap;
1608-
1609-
intern = dom_objects_set_class(class_type);
1610-
intern->ptr = emalloc(sizeof(dom_nnodemap_object));
1611-
objmap = (dom_nnodemap_object *)intern->ptr;
1612-
ZVAL_UNDEF(&objmap->baseobj_zv);
1613-
objmap->baseobj = NULL;
1614-
objmap->nodetype = 0;
1615-
objmap->ht = NULL;
1616-
objmap->local = NULL;
1617-
objmap->local_lower = NULL;
1618-
objmap->release_local = false;
1619-
objmap->ns = NULL;
1620-
objmap->release_ns = false;
1621-
objmap->cache_tag.modification_nr = 0;
1606+
dom_object *intern = dom_objects_set_class(class_type);
1607+
intern->ptr = ecalloc(1, sizeof(dom_nnodemap_object));
1608+
dom_nnodemap_object *objmap = intern->ptr;
16221609
objmap->cached_length = -1;
1623-
objmap->cached_obj = NULL;
1624-
objmap->cached_obj_index = 0;
1625-
objmap->dict = NULL;
16261610

16271611
return &intern->std;
16281612
}

0 commit comments

Comments
 (0)