outer might be NULL; close #428

38c4a317 · Yukihiro Matsumoto · 23e88dba · 38c4a317
Commit 38c4a317 authored Aug 16, 2012 by Yukihiro Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

src/variable.c src/variable.c +8 -5

No files found.
--- a/src/variable.c
+++ b/src/variable.c
@@ -905,13 +905,16 @@ mrb_class_sym(mrb_state *mrb, struct RClass *c, struct RClass *outer)
  name = mrb_obj_iv_get(mrb, (struct RObject*)c, mrb_intern(mrb, "__classid__"));
  if (mrb_nil_p(name)) {
-    struct csym_arg arg;
-    arg.c = c;
+    if (!outer) return 0;
-    arg.sym = 0;
+    else {
+      struct csym_arg arg;
-    iv_foreach(mrb, outer->iv, csym_i, &arg);
+      arg.c = c;
-    return arg.sym;
+      arg.sym = 0;
+      iv_foreach(mrb, outer->iv, csym_i, &arg);
+      return arg.sym;
+    }
  }
  return SYM2ID(name);
 }