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

check length before calling stack_copy(); based on a patch from @mirich; close #2129

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2014-04-26 12:07:51 +09:00
parent b1b3ee4547
commit e76be4e2ab
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+9 -3
View File
@@ -249,7 +249,9 @@ cipop(mrb_state *mrb)
mrb_value *p = (mrb_value *)mrb_malloc(mrb, sizeof(mrb_value)*len);
MRB_ENV_UNSHARE_STACK(e);
stack_copy(p, e->stack, len);
if (len > 0) {
stack_copy(p, e->stack, len);
}
e->stack = p;
}
@@ -387,7 +389,9 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, mrb_int argc
mrb->c->stack[0] = self;
if (undef) {
mrb->c->stack[1] = mrb_symbol_value(undef);
stack_copy(mrb->c->stack+2, argv, argc-1);
if (argc > 1) {
stack_copy(mrb->c->stack+2, argv, argc-1);
}
}
else if (argc > 0) {
stack_copy(mrb->c->stack+1, argv, argc);
@@ -1230,7 +1234,9 @@ RETRY_TRY_BLOCK:
}
regs[a] = mrb_ary_new_capa(mrb, m1+len+m2);
rest = mrb_ary_ptr(regs[a]);
stack_copy(rest->ptr, stack, m1);
if (m1 > 0) {
stack_copy(rest->ptr, stack, m1);
}
if (len > 0) {
stack_copy(rest->ptr+m1, pp, len);
}