summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2018-04-11 10:24:44 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2018-04-11 10:24:44 +0900
commit1905091634a6a2925c911484434448e568330626 (patch)
tree220431670a6a7c4a3915540f31013fcf149776c9 /src
parente340b1725260e70a001372e5330e618b8975392d (diff)
downloadmruby-1905091634a6a2925c911484434448e568330626.tar.gz
mruby-1905091634a6a2925c911484434448e568330626.zip
Check length of env stack before accessing upvar; fix #3995
Diffstat (limited to 'src')
-rw-r--r--src/vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vm.c b/src/vm.c
index ae9bf2e69..0acdd1ba8 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1201,11 +1201,11 @@ RETRY_TRY_BLOCK:
mrb_value *regs_a = regs + a;
struct REnv *e = uvenv(mrb, c);
- if (!e) {
- *regs_a = mrb_nil_value();
+ if (e && b < MRB_ENV_STACK_LEN(e)) {
+ *regs_a = e->stack[b];
}
else {
- *regs_a = e->stack[b];
+ *regs_a = mrb_nil_value();
}
NEXT;
}