diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-04-05 22:28:46 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-04-05 22:30:39 +0900 |
| commit | a7b0ab3769d9f7f13d47c2c6f23298c87b88eee8 (patch) | |
| tree | 70dfecde64dd5050aa65834c3f99d75e262581ae /src/kernel.c | |
| parent | d9fb8b69b0621e8cd2c7c43fd8511a83718d7e45 (diff) | |
| download | mruby-a7b0ab3769d9f7f13d47c2c6f23298c87b88eee8.tar.gz mruby-a7b0ab3769d9f7f13d47c2c6f23298c87b88eee8.zip | |
Save block argument position in e->cioff; fix #3593
Diffstat (limited to 'src/kernel.c')
| -rw-r--r-- | src/kernel.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/kernel.c b/src/kernel.c index 8670e0651..5ac0a3774 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -157,8 +157,14 @@ mrb_f_block_given_p_m(mrb_state *mrb, mrb_value self) /* top-level does not have block slot (alway false) */ if (sp == mrb->c->stbase) return mrb_false_value(); - ci = mrb->c->cibase + e->cioff; - bp = ci[1].stackent + 1; + if (e->cioff < 0) { + /* use saved block arg position */ + bp = &e->stack[-e->cioff]; + } + else { + ci = mrb->c->cibase + e->cioff; + bp = ci[1].stackent + 1; + } } } if (ci->argc > 0) { |