Skip to content

soap: only do a single call to zend_hash_get_current_key() #25294

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
Girgias merged 1 commit into from
Nov 8, 2026
Merged

soap: only do a single call to zend_hash_get_current_key() #25294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions ext/soap/php_schema.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2200,8 +2200,10 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT
if (tmp->attributes) {
zend_hash_internal_pointer_reset(tmp->attributes);
while ((tmp_attr = zend_hash_get_current_data_ptr(tmp->attributes)) != NULL) {
if (zend_hash_get_current_key_type(tmp->attributes) == HASH_KEY_IS_STRING) {
zend_string* _key;
zend_string *key;
zend_ulong index;
zend_hash_key_type status = zend_hash_get_current_key(tmp->attributes, &key, &index);
if (status == HASH_KEY_IS_STRING) {
sdlAttributePtr newAttr;

schema_attribute_fixup(ctx, tmp_attr);
Expand All @@ -2219,15 +2221,12 @@ static void schema_attributegroup_fixup(sdlCtx *ctx, sdlAttributePtr attr, HashT
newAttr->extraAttributes = ht;
}

zend_hash_get_current_key(tmp->attributes, &_key, NULL);
zend_hash_add_ptr(ht, _key, newAttr);
zend_hash_add_ptr(ht, key, newAttr);

zend_hash_move_forward(tmp->attributes);
} else {
zend_ulong index;

ZEND_ASSERT(status == HASH_KEY_IS_LONG);
schema_attributegroup_fixup(ctx, tmp_attr, ht);
zend_hash_get_current_key(tmp->attributes, NULL, &index);
zend_hash_index_del(tmp->attributes, index);
}
}
Expand Down
Loading