From 58a9621df7b5336448c5d16f7b2eb00a3edc76f1 Mon Sep 17 00:00:00 2001 From: dearblue Date: Sun, 28 Nov 2021 14:10:37 +0900 Subject: Fix `args_unshift()` in `mrbgems/mruby-method` Both keyword arguments and block arguments were being destroyed when there were no arguments. The cause of this is #5585. I' m sorry. --- mrbgems/mruby-method/src/method.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mrbgems/mruby-method/src/method.c b/mrbgems/mruby-method/src/method.c index 18fcaa03a..85e8872e2 100644 --- a/mrbgems/mruby-method/src/method.c +++ b/mrbgems/mruby-method/src/method.c @@ -46,10 +46,18 @@ args_unshift(mrb_state *mrb, mrb_value obj) if (ci->n < 15) { mrb_assert(ci->nk == 0 || ci->nk == 15); - argv[0] = mrb_ary_new_from_values(mrb, ci->n, argv); - argv[1] = argv[ci->n]; // keyword or block - if (ci->nk == 15) { - argv[2] = argv[ci->n + 1]; // block + mrb_value args = mrb_ary_new_from_values(mrb, ci->n, argv); + if (ci->nk == 0) { + mrb_value block = argv[ci->n]; + argv[0] = args; + argv[1] = block; + } + else { + mrb_value keyword = argv[ci->n]; + mrb_value block = argv[ci->n + 1]; + argv[0] = args; + argv[1] = keyword; + argv[2] = block; } ci->n = 15; } -- cgit v1.2.3