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

Merge pull request #1608 from nanamiwang/vmcrash

Browse Source 
Fixed callinfo buffer overflow while calling ensure handlers
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-12-15 15:38:42 -08:00
parent 882afdea20 87a392067a
commit 06f518b93a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+5 -3
View File
@@ -1287,10 +1287,12 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
mrb->jmp = prev_jmp;
mrb_longjmp(mrb);
}
while (eidx > ci[-1].eidx) {
ecall(mrb, --eidx);
if (ci > mrb->c->cibase) {
while (eidx > ci[-1].eidx) {
ecall(mrb, --eidx);
}
}
if (ci == mrb->c->cibase) {
else if (ci == mrb->c->cibase) {
if (ci->ridx == 0) {
regs = mrb->c->stack = mrb->c->stbase;
goto L_STOP;