From 6b8664b951af9b8734d5127bd8a746a67fde283c Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 29 Aug 2020 23:00:36 +0900 Subject: Fix the bug caused by `to_a` returning a frozen array. Reported by @shuujii. --- src/array.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/array.c b/src/array.c index 020b661b4..f80134de4 100644 --- a/src/array.c +++ b/src/array.c @@ -1078,11 +1078,11 @@ mrb_ary_rindex_m(mrb_state *mrb, mrb_value self) MRB_API mrb_value mrb_ary_splat(mrb_state *mrb, mrb_value v) { - mrb_value a; + mrb_value ary; + struct RArray *a; if (mrb_array_p(v)) { - struct RArray *a = mrb_ary_ptr(v); - a = ary_dup(mrb, a); + a = ary_dup(mrb, mrb_ary_ptr(v)); return mrb_obj_value(a); } @@ -1090,12 +1090,17 @@ mrb_ary_splat(mrb_state *mrb, mrb_value v) return mrb_ary_new_from_values(mrb, 1, &v); } - a = mrb_funcall(mrb, v, "to_a", 0); - if (mrb_nil_p(a)) { + ary = mrb_funcall(mrb, v, "to_a", 0); + if (mrb_nil_p(ary)) { return mrb_ary_new_from_values(mrb, 1, &v); } - mrb_ensure_array_type(mrb, a); - return a; + mrb_ensure_array_type(mrb, ary); + a = mrb_ary_ptr(ary); + if (mrb_frozen_p(a)) { + a = ary_dup(mrb, a); + return mrb_obj_value(a); + } + return ary; } static mrb_value -- cgit v1.2.3