admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

hash.c (mrb_hash_foreach): wrap function call with h_check_modified

Browse Source 
If the iterating hash is modified in the function, h_each loop may
crash accessing modified (and probably deallocated) internal data.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-06-17 10:55:55 +09:00
parent e502fd88b9
commit 20552fe176
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hash.c
+6 -2
View File
@@ -273,7 +273,7 @@ HT_ASSERT_SAFE_READ(ea_capa);
} \
code; \
if (flags__ != (h__->flags & mask__) || \
tbl__ != h__->hsh.ht || \
tbl__ != h__->hsh.ht || \
((H_CHECK_MODIFIED_USE_HT_EA_CAPA_FOR_AR || h_ht_p(h__)) && \
ht_ea_capa__ != ht_ea_capa(h__)) || \
((H_CHECK_MODIFIED_USE_HT_EA_FOR_AR || h_ht_p(h__)) && \
@@ -1109,7 +1109,11 @@ MRB_API void
mrb_hash_foreach(mrb_state *mrb, struct RHash *h, mrb_hash_foreach_func *func, void *data)
{
h_each(h, entry, {
if (func(mrb, entry->key, entry->val, data) != 0) return;
int n;
h_check_modified(mrb, h, {
n = func(mrb, entry->key, entry->val, data);
});
if (n != 0) return;
});
}