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

array.c (srot_cmp): need modify check after mrb_cmp as well; #6326

Browse Source 
mrb_cmp() may also modify the sorting array internally.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2024-08-22 07:49:16 +09:00
parent 4ea6d74d83
commit 58c70834d9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/array.c
+8 -7
View File
@@ -1586,21 +1586,22 @@ static mrb_bool
sort_cmp(mrb_state *mrb, mrb_value ary, mrb_value *p, mrb_int a, mrb_int b, mrb_value blk)
{
mrb_int cmp;
mrb_value va = p[a], vb = p[b];
if (mrb_nil_p(blk)) {
cmp = mrb_cmp(mrb, p[a], p[b]);
cmp = mrb_cmp(mrb, va, vb);
}
else {
mrb_value c = mrb_funcall_id(mrb, blk, MRB_SYM(call), 2, p[a], p[b]);
mrb_int size = RARRAY_LEN(ary);
if (RARRAY_PTR(ary) != p || size < a || size < b) {
mrb_raise(mrb, E_RUNTIME_ERROR, "array modified during sort");
}
mrb_value c = mrb_funcall_id(mrb, blk, MRB_SYM(call), 2, va, vb);
if (mrb_nil_p(c) || !mrb_fixnum_p(c)) {
mrb_raisef(mrb, E_ARGUMENT_ERROR, "comparison of %!v and %!v failed", p[a], p[b]);
mrb_raisef(mrb, E_ARGUMENT_ERROR, "comparison of %!v and %!v failed", va, vb);
}
cmp = mrb_fixnum(c);
}
mrb_int size = RARRAY_LEN(ary);
if (RARRAY_PTR(ary) != p || size < a || size < b) {
mrb_raise(mrb, E_RUNTIME_ERROR, "array modified during sort");
}
return cmp > 0;
}