1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rb_int_range_last: properly handle non-exclusive range

Browse Source 
[Bug #18994]
This commit is contained in:
Jean Boussier 2022-09-04 09:44:59 +02:00
parent cfa40e225a
commit bbe5ec7846
Notes: git 2022-09-04 18:16:33 +09:00 
Merged: https://github.com/ruby/ruby/pull/6324
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
range.c
View File

@ -1107,10 +1107,6 @@ rb_int_range_last(int argc, VALUE *argv, VALUE range)
x = EXCL(range); x = EXCL(range);
len_1 = rb_int_minus(e, b); len_1 = rb_int_minus(e, b);
if (FIXNUM_ZERO_P(len_1) || rb_num_negative_p(len_1)) {
return rb_ary_new_capa(0);
}
if (x) { if (x) {
e = rb_int_minus(e, ONE); e = rb_int_minus(e, ONE);
len = len_1; len = len_1;
@ -1119,6 +1115,10 @@ rb_int_range_last(int argc, VALUE *argv, VALUE range)
len = rb_int_plus(len_1, ONE); len = rb_int_plus(len_1, ONE);
} }
if (FIXNUM_ZERO_P(len) || rb_num_negative_p(len)) {
return rb_ary_new_capa(0);
}
rb_scan_args(argc, argv, "1", &nv); rb_scan_args(argc, argv, "1", &nv);
n = NUM2LONG(nv); n = NUM2LONG(nv);
if (n < 0) { if (n < 0) {

6
spec/ruby/core/range/last_spec.rb
View File

@ -8,6 +8,12 @@ describe "Range#last" do
(1..5).last(3).should == [3, 4, 5] (1..5).last(3).should == [3, 4, 5]
end end
ruby_bug '#18994', '2.7'...'3.2' do
it "returns the specified number if elements for single element inclusive range" do
(1..1).last(1).should == [1]
end
end
it "returns an empty array for an empty Range" do it "returns an empty array for an empty Range" do
(0...0).last(2).should == [] (0...0).last(2).should == []
end end