[php-src] master: Fix key data for NodeList iterations
| From: | Niels Dossche | Date: | Wed, 10 Apr 2024 17:08:00 +0000 |
| Subject: | [php-src] master: Fix key data for NodeList iterations | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128057@lists.php.net to get a copy of this message | ||
Author: Niels Dossche (nielsdos)
Date: 2024-04-10T19:07:52+02:00
Commit: https://github.com/php/php-src/commit/2bf9da6e3d492c8533b4d0816016615a8437b189
Raw diff: https://github.com/php/php-src/commit/2bf9da6e3d492c8533b4d0816016615a8437b189.diff
Fix key data for NodeList iterations
Changed paths:
M ext/dom/dom_iterators.c
Diff:
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c
index 9b64a671d4c5..a6e6493ccb7b 100644
--- a/ext/dom/dom_iterators.c
+++ b/ext/dom/dom_iterators.c
@@ -123,8 +123,10 @@ static void php_dom_iterator_current_key(zend_object_iterator *iter, zval *key)
{
php_dom_iterator *iterator = (php_dom_iterator *)iter;
zval *object = &iterator->intern.data;
+ zend_class_entry *ce = Z_OBJCE_P(object);
- if (instanceof_function(Z_OBJCE_P(object), dom_nodelist_class_entry)) {
+ /* Nodelists have the index as a key while named node maps have the name as a key. */
+ if (instanceof_function(ce, dom_nodelist_class_entry) || instanceof_function(ce,
dom_modern_nodelist_class_entry)) {
ZVAL_LONG(key, iter->index);
} else {
dom_object *intern = Z_DOMOBJ_P(&iterator->curobj);