admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the bug caused by to_a returning a frozen array.

Browse Source 
Reported by @shuujii.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2020-08-29 23:00:36 +09:00
parent f08f3c34be
commit 6b8664b951
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+12 -7
View File
@@ -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