Merge pull request #2801 from carsonmcdonald/fix2779

Add locals null checks

Merge pull request #2801 from carsonmcdonald/fix2779
Add locals null checks
b97c6d10 · Yukihiro "Matz" Matsumoto · a94ff966 · 3e911a8e · b97c6d10
Commit b97c6d10 authored May 23, 2015 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/parse.y src/parse.y +6 -2

No files found.
--- a/src/parse.y
+++ b/src/parse.y
@@ -239,7 +239,9 @@ local_nest(parser_state *p)
 static void
 local_unnest(parser_state *p)
 {
-  p->locals = p->locals->cdr;
+  if (p->locals) {
+    p->locals = p->locals->cdr;
+  }
 }

 static mrb_bool
@@ -261,7 +263,9 @@ local_var_p(parser_state *p, mrb_sym sym)
 static void
 local_add_f(parser_state *p, mrb_sym sym)
 {
-  p->locals->car = push(p->locals->car, nsym(sym));
+  if (p->locals) {
+    p->locals->car = push(p->locals->car, nsym(sym));
+  }
 }

 static void