Skip to content

Don't use the obj_map cache for attributes #18895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 22, 2025
Merged

Don't use the obj_map cache for attributes #18895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4546f48
Don't use the obj_map cache for attributes
nielsdos Jun 21, 2025
4e6e9cf
merge functions
nielsdos Jun 21, 2025
6d22243
add forgotten test
nielsdos Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions ext/dom/obj_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,25 @@ static void dom_map_cache_obj(dom_nnodemap_object *map, xmlNodePtr itemnode, zen
map->cached_obj = cached_obj;
}

static xmlNodePtr dom_map_get_attr_start(xmlNodePtr node)
static void dom_map_get_attributes_item(dom_nnodemap_object *map, zend_long index, zval *return_value)
{
ZEND_ASSERT(node->type == XML_ELEMENT_NODE);
return (xmlNodePtr) node->properties;
xmlNodePtr nodep = dom_object_get_node(map->baseobj);
xmlNodePtr itemnode = NULL;
if (nodep && index >= 0) {
ZEND_ASSERT(nodep->type == XML_ELEMENT_NODE);
itemnode = (xmlNodePtr) nodep->properties;
for (; index > 0 && itemnode; itemnode = itemnode->next, index--);
}
dom_ret_node_to_zobj(map, itemnode, return_value);
}

static void dom_map_get_chain_item(dom_nnodemap_object *map, zend_long index, zval *return_value, xmlNodePtr (*get_start)(xmlNodePtr))
static void dom_map_get_nodes_item(dom_nnodemap_object *map, zend_long index, zval *return_value)
{
xmlNodePtr nodep = dom_object_get_node(map->baseobj);
xmlNodePtr itemnode = NULL;
if (nodep && index >= 0) {
dom_node_idx_pair start_point = dom_obj_map_get_start_point(map, nodep, index);
itemnode = start_point.node ? start_point.node : get_start(nodep);
itemnode = start_point.node ? start_point.node : dom_nodelist_iter_start_first_child(nodep);
for (; start_point.index > 0 && itemnode; itemnode = itemnode->next, start_point.index--);
}
dom_ret_node_to_zobj(map, itemnode, return_value);
Expand All @@ -219,16 +225,6 @@ static void dom_map_get_chain_item(dom_nnodemap_object *map, zend_long index, zv
}
}

static void dom_map_get_attributes_item(dom_nnodemap_object *map, zend_long index, zval *return_value)
{
dom_map_get_chain_item(map, index, return_value, dom_map_get_attr_start);
}

static void dom_map_get_nodes_item(dom_nnodemap_object *map, zend_long index, zval *return_value)
{
dom_map_get_chain_item(map, index, return_value, dom_nodelist_iter_start_first_child);
}

static void dom_map_get_by_tag_name_item(dom_nnodemap_object *map, zend_long index, zval *return_value)
{
xmlNodePtr nodep = dom_object_get_node(map->baseobj);
Expand Down Expand Up @@ -352,7 +348,7 @@ const php_dom_obj_map_handler php_dom_obj_map_attributes = {
.get_item = dom_map_get_attributes_item,
.get_named_item = dom_map_get_named_item_prop,
.has_named_item = dom_map_has_named_item_prop,
.use_cache = true,
.use_cache = false,
.nameless = false,
};

Expand Down
17 changes: 17 additions & 0 deletions ext/dom/tests/modern/common/attr_named_node_map_cache.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
--TEST--
Attribute named node map cache
--EXTENSIONS--
dom
--FILE--
<?php

$dom = Dom\XMLDocument::createFromString('<root a="1" b="2" c="3"/>');
$attrs = $dom->documentElement->attributes;
var_dump($attrs[1]->nodeName);
$dom->documentElement->removeAttribute('b');
var_dump($attrs[1]->nodeName);

?>
--EXPECT--
string(1) "b"
string(1) "c"