From 4a99f28ec37152babd82328b1441b5cca6a311d5 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 3 Dec 2024 16:47:29 +0900 Subject: [PATCH] Revert "vm.c (cipush): small refactoring" This reverts commit d6e23f3cdc31e1448a5298436ba6a3d62d9c8e85. Caused some memory crashes. --- src/vm.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/vm.c b/src/vm.c index 8bb6e7968..8075a6e6e 100644 --- a/src/vm.c +++ b/src/vm.c @@ -335,17 +335,20 @@ cipush(mrb_state *mrb, mrb_int push_stacks, uint8_t cci, struct RClass *target_c const struct RProc *proc, struct RProc *blk, mrb_sym mid, uint16_t argc) { struct mrb_context *c = mrb->c; - mrb_callinfo *ci = ++c->ci; + mrb_callinfo *ci = c->ci + 1; - if (ci == c->ciend) { - ptrdiff_t diff = ci - c->cibase; + if (ci < c->ciend) { + c->ci = ci; + } + else { + ptrdiff_t size = ci - c->cibase; - if (diff >= MRB_CALL_LEVEL_MAX) { + if (size >= MRB_CALL_LEVEL_MAX) { mrb_exc_raise(mrb, mrb_obj_value(mrb->stack_err)); } - c->cibase = (mrb_callinfo*)mrb_realloc(mrb, c->cibase, sizeof(mrb_callinfo)*diff*2); - c->ci = ci = c->cibase + diff; - c->ciend = c->cibase + diff * 2; + c->cibase = (mrb_callinfo*)mrb_realloc(mrb, c->cibase, sizeof(mrb_callinfo)*size*2); + c->ci = ci = c->cibase + size; + c->ciend = c->cibase + size * 2; } ci->mid = mid; CI_PROC_SET(ci, proc);