Skip to content

Catch exceptions while initializing. #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mattn wants to merge 4 commits into from
Closed

Catch exceptions while initializing. #808

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17191b2
Catch exceptions while initializing
mattn Feb 1, 2013
e22d7be
Must clear jmp if mrb_init_core is passed.
mattn Feb 1, 2013
c0c2161
Merge branch 'master' into catch_initerror
mattn Feb 1, 2013
0e874ac
Call mrb_p if possible.
mattn Feb 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include "mruby/irep.h"
#include "mruby/variable.h"
#include <string.h>
#include <setjmp.h>
#include <stdio.h>

void mrb_init_heap(mrb_state*);
void mrb_init_core(mrb_state*);
Expand All @@ -16,6 +18,7 @@ void mrb_final_core(mrb_state*);
mrb_state*
mrb_open_allocf(mrb_allocf f, void *ud)
{
jmp_buf c_jmp;
static const mrb_state mrb_state_zero = { 0 };
mrb_state *mrb = (mrb_state *)(f)(NULL, NULL, sizeof(mrb_state), ud);
if (mrb == NULL) return NULL;
Expand All @@ -26,7 +29,20 @@ mrb_open_allocf(mrb_allocf f, void *ud)
mrb->current_white_part = MRB_GC_WHITE_A;

mrb_init_heap(mrb);

if (setjmp(c_jmp) != 0) {
if (mrb->exc) {
#ifdef ENABLE_STDIO
mrb_p(mrb, mrb_obj_value(mrb->exc));
#endif
mrb->jmp = NULL;
}
return NULL;
}
mrb->jmp = &c_jmp;

mrb_init_core(mrb);
mrb->jmp = NULL;
return mrb;
}

Expand Down