Skip to content

Commit 2a6122c

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix uninitialized memory accesses in DOM iterator
2 parents 3772b50 + 8950c24 commit 2a6122c

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

ext/dom/dom_iterators.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,13 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i
269269
zend_throw_error(NULL, "An iterator cannot be used with foreach by reference");
270270
return NULL;
271271
}
272-
iterator = emalloc(sizeof(php_dom_iterator));
272+
iterator = emalloc(sizeof(*iterator));
273+
memset(iterator, 0, sizeof(*iterator));
273274
zend_iterator_init(&iterator->intern);
274-
iterator->cache_tag.modification_nr = 0;
275275

276276
ZVAL_OBJ_COPY(&iterator->intern.data, Z_OBJ_P(object));
277277
iterator->intern.funcs = &php_dom_iterator_funcs;
278278

279-
ZVAL_UNDEF(&iterator->curobj);
280-
281279
intern = Z_DOMOBJ_P(object);
282280
objmap = (dom_nnodemap_object *)intern->ptr;
283281
if (objmap != NULL) {

0 commit comments

Comments
 (0)