Merge pull request #239 from thecodeshop/jf/mrb_open

guard mrb_open mem allocation and downstream usage

4 files changed, 51 insertions, 0 deletions

diff --git a/src/codegen.c b/src/codegen.c
index 117588b6e..027b6777f 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -2292,6 +2292,11 @@ main()
   mrb_state *mrb = mrb_open();
   int n;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting codegen test");
+    return EXIT_FAILURE;
+  }
+
 #if 1
   n = mrb_compile_string(mrb, "p(__FILE__)\np(__LINE__)");
 #else
diff --git a/src/gc.c b/src/gc.c
index b7c08de65..64a92d11e 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -934,6 +934,11 @@ test_mrb_field_write_barrier(void)
   mrb_state *mrb = mrb_open();
   struct RBasic *obj, *value;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_mrb_field_write_barrier");
+    return;
+  }
+
   puts("test_mrb_field_write_barrier");
   obj = RBASIC(mrb_ary_new(mrb));
   value = RBASIC(mrb_str_new_cstr(mrb, "value"));
@@ -997,6 +1002,11 @@ test_mrb_write_barrier(void)
   mrb_state *mrb = mrb_open();
   struct RBasic *obj;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_mrb_write_barrier");
+    return;
+  }
+
   puts("test_mrb_write_barrier");
   obj = RBASIC(mrb_ary_new(mrb));
   paint_black(obj);
@@ -1024,6 +1034,11 @@ test_add_gray_list(void)
   mrb_state *mrb = mrb_open();
   struct RBasic *obj1, *obj2;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_add_gray_list");
+    return;
+  }
+
   puts("test_add_gray_list");
   gc_assert(mrb->gray_list == NULL);
   obj1 = RBASIC(mrb_str_new_cstr(mrb, "test"));
@@ -1048,6 +1063,11 @@ test_gc_gray_mark(void)
   struct RBasic *obj;
   size_t gray_num = 0;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_gc_gray_mark");
+    return;
+  }
+
   puts("test_gc_gray_mark");
 
   puts("  in MRB_TT_CLASS");
@@ -1079,6 +1099,11 @@ test_incremental_gc(void)
   RVALUE *free;
   struct heap_page *page;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_incremental_gc");
+    return;
+  }
+
   puts("test_incremental_gc");
 
   mrb_garbage_collect(mrb);
@@ -1135,6 +1160,11 @@ test_incremental_sweep_phase(void)
 {
   mrb_state *mrb = mrb_open();
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_incremental_sweep_phase");
+    return;
+  }
+
   puts("test_incremental_sweep_phase");
 
   add_heap(mrb);
@@ -1158,6 +1188,11 @@ test_gc_api(void)
 
   mrb_value argv[1];
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting test_gc_api");
+    return;
+  }
+
   puts("test_gc_api");
 
   gc_start(mrb, mrb_nil_value());
@@ -1191,6 +1226,11 @@ test_many_object_benchmark(void)
   mrb_value ary = mrb_ary_new(mrb);
   int save_point = mrb_gc_arena_save(mrb);
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, test_many_object_benchmark");
+    return;
+  }
+
   puts("test_many_object_benchmark");
 
   for (i=0; i<1000; i++) {
diff --git a/src/parse.y b/src/parse.y
index eae9fb373..884290961 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -5518,6 +5518,11 @@ main()
   mrb_state *mrb = mrb_open();
   int n;
 
+  if (mrb == NULL) {
+    fprintf(stderr, "Invalid mrb_state, exiting parser test");
+    return EXIT_FAILURE;
+  }
+
   n = mrb_compile_string(mrb, "\
 def fib(n)\n\
   if n<2\n\
diff --git a/src/state.c b/src/state.c
index 727bd8ecb..e4729ca70 100644
--- a/src/state.c
+++ b/src/state.c
@@ -16,6 +16,7 @@ mrb_state*
 mrb_open_allocf(mrb_allocf f)
 {
   mrb_state *mrb = (f)(NULL, NULL, sizeof(mrb_state));
+  if (mrb == NULL) return NULL;
 
   memset(mrb, 0, sizeof(mrb_state));
   mrb->allocf = f;