summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-eval
diff options
context:
space:
mode:
authorTatsuhiko Kubo <[email protected]>2014-08-19 17:50:07 +0900
committerTatsuhiko Kubo <[email protected]>2014-08-19 17:50:07 +0900
commite035508efd545dabfad0a1b339dbcd4aacea4604 (patch)
tree44cd2e273c378e37ef6f0535e2a22ec441ae59fc /mrbgems/mruby-eval
parentf62dc56ba2f9401479aeaf333cfdb7ba0909c361 (diff)
downloadmruby-e035508efd545dabfad0a1b339dbcd4aacea4604.tar.gz
mruby-e035508efd545dabfad0a1b339dbcd4aacea4604.zip
Fix error handling for mrb_generate_code().
The return value of mrb_generate_code() must be null-checked before referencing.
Diffstat (limited to 'mrbgems/mruby-eval')
-rw-r--r--mrbgems/mruby-eval/src/eval.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/mrbgems/mruby-eval/src/eval.c b/mrbgems/mruby-eval/src/eval.c
index 56f4877cc..738d64709 100644
--- a/mrbgems/mruby-eval/src/eval.c
+++ b/mrbgems/mruby-eval/src/eval.c
@@ -132,6 +132,12 @@ create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, cha
}
proc = mrb_generate_code(mrb, p);
+ if (proc == NULL) {
+ /* codegen error */
+ mrb_parser_free(p);
+ mrbc_context_free(mrb, cxt);
+ mrb_raise(mrb, E_SCRIPT_ERROR, "codegen error");
+ }
if (mrb->c->ci[-1].proc->target_class) {
proc->target_class = mrb->c->ci[-1].proc->target_class;
}
@@ -146,11 +152,6 @@ create_proc_from_string(mrb_state *mrb, char *s, int len, mrb_value binding, cha
mrb_parser_free(p);
mrbc_context_free(mrb, cxt);
- if (proc == NULL) {
- /* codegen error */
- mrb_raise(mrb, E_SCRIPT_ERROR, "codegen error");
- }
-
return proc;
}