summaryrefslogtreecommitdiffhomepage
path: root/src/parse.y
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-05-23 16:11:22 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-05-23 16:11:22 +0900
commitb97c6d10a2c75822bd40e4019b1df64bcb22584e (patch)
tree49f010b713642c317025f8906dee537c9fcc3d7f /src/parse.y
parenta94ff9666ef01b27bba9fc86dffd5483303f5b51 (diff)
parent3e911a8e146f3d8f3bf77ac9378c12450da77590 (diff)
downloadmruby-b97c6d10a2c75822bd40e4019b1df64bcb22584e.tar.gz
mruby-b97c6d10a2c75822bd40e4019b1df64bcb22584e.zip
Merge pull request #2801 from carsonmcdonald/fix2779
Add locals null checks
Diffstat (limited to 'src/parse.y')
-rw-r--r--src/parse.y8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/parse.y b/src/parse.y
index 55ad602ba..25522e8b0 100644
--- 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