diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-02-11 18:13:39 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-02-11 18:13:39 +0900 |
| commit | 642ab8ecdace909b7bd294190e342e58c67ce6c8 (patch) | |
| tree | ee94b575e0af33e3822898be73b500288e9bb071 /src/vm.c | |
| parent | 0b143898c4203ce611dc0d270569fc576f894758 (diff) | |
| download | mruby-642ab8ecdace909b7bd294190e342e58c67ce6c8.tar.gz mruby-642ab8ecdace909b7bd294190e342e58c67ce6c8.zip | |
`ecall()` should preserve stack address referenced from ci[1].
OP_RETURN accesses ci[1]->stackent that might be broken; fix #3442
Diffstat (limited to 'src/vm.c')
| -rw-r--r-- | src/vm.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -281,6 +281,7 @@ ecall(mrb_state *mrb, int i) mrb_value *self = mrb->c->stack; struct RObject *exc; int cioff; + mrb_value *nstk; if (i<0) return; p = mrb->c->ensure[i]; @@ -289,6 +290,7 @@ ecall(mrb_state *mrb, int i) mrb->c->ci->eidx = i; cioff = mrb->c->ci - mrb->c->cibase; ci = cipush(mrb); + nstk = ci->stackent; ci->stackent = mrb->c->stack; ci->mid = ci[-1].mid; ci->acc = CI_ACC_SKIP; @@ -300,6 +302,7 @@ ecall(mrb_state *mrb, int i) exc = mrb->exc; mrb->exc = 0; mrb_run(mrb, p, *self); mrb->c->ensure[i] = NULL; + ci->stackent = nstk; mrb->c->ci = mrb->c->cibase + cioff; if (!mrb->exc) mrb->exc = exc; } |
