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

vm.c (ary_new_from_regs): stack may be reallocated.

Browse Source 
Unlike `hash_new_from_regs`, `ary_new_from_regs` do not call
`mrb_funcall` et al directly or indirectly. But since it may invoke the
garbage collection, and hooks for GC may call `mrb_funcall` etc (although
calling them is not encouraged), we care stack reallocation just for the
safety.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2022-05-30 01:19:10 +09:00
parent aa7f98dedb
commit 8981b2fb28
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+15 -4
View File
@@ -1204,6 +1204,17 @@ hash_new_from_regs(mrb_state *mrb, mrb_int argc, mrb_int idx)
} \
} while (0)
static mrb_value
ary_new_from_regs(mrb_state *mrb, mrb_int argc, mrb_int idx)
{
mrb_value ary = mrb_ary_new_capa(mrb, argc);
while (argc--) {
mrb_ary_push(mrb, ary, regs[idx]);
idx++;
}
return ary;
}
MRB_API mrb_value
mrb_vm_exec(mrb_state *mrb, const struct RProc *proc, const mrb_code *pc)
{
@@ -1922,7 +1933,7 @@ RETRY_TRY_BLOCK:
}
else if (argc == 14) {
/* pack arguments and kdict */
regs[1] = mrb_ary_new_from_values(mrb, argc+1, &regs[1]);
regs[1] = ary_new_from_regs(mrb, argc+1, 1);
argc = ci->n = 15;
}
else {/* argc == 15 */
@@ -2625,12 +2636,12 @@ RETRY_TRY_BLOCK:
}
CASE(OP_ARRAY, BB) {
regs[a] = mrb_ary_new_from_values(mrb, b, &regs[a]);
regs[a] = ary_new_from_regs(mrb, b, a);
mrb_gc_arena_restore(mrb, ai);
NEXT;
}
CASE(OP_ARRAY2, BBB) {
regs[a] = mrb_ary_new_from_values(mrb, c, &regs[b]);
regs[a] = ary_new_from_regs(mrb, c, b);
mrb_gc_arena_restore(mrb, ai);
NEXT;
}
@@ -2700,7 +2711,7 @@ RETRY_TRY_BLOCK:
int len, idx;
if (!mrb_array_p(v)) {
v = mrb_ary_new_from_values(mrb, 1, &regs[a]);
v = ary_new_from_regs(mrb, 1, a);
}
ary = mrb_ary_ptr(v);
len = (int)ARY_LEN(ary);