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 #890 from cremno/mrb_funcall--adjust-ci-and-sp-after-error

Browse Source 
mrb_funcall_with_block: raised exception corrupts ci and stack
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-02-26 23:31:38 -08:00
parent dfafa59c0a 5de62ac23d
commit 01274bcc46
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+5
View File
@@ -316,8 +316,13 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
if (!mrb->jmp) {
jmp_buf c_jmp;
mrb_callinfo *old_ci = mrb->ci;
if (setjmp(c_jmp) != 0) { /* error */
while (old_ci != mrb->ci) {
mrb->stack = mrb->stbase + mrb->ci->stackidx;
cipop(mrb);
}
mrb->jmp = 0;
return mrb_nil_value();
}