From bbe5ec78463f8d6ef2e1a3571f17357a3d9ec8e4 Mon Sep 17 00:00:00 2001 From: Jean Boussier Date: Sun, 4 Sep 2022 09:44:59 +0200 Subject: [PATCH] rb_int_range_last: properly handle non-exclusive range [Bug #18994] --- range.c | 8 ++++---- spec/ruby/core/range/last_spec.rb | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/range.c b/range.c index 39786ed97c..b49b1bd79c 100644 --- a/range.c +++ b/range.c @@ -1107,10 +1107,6 @@ rb_int_range_last(int argc, VALUE *argv, VALUE range) x = EXCL(range); 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) { e = rb_int_minus(e, ONE); len = len_1; @@ -1119,6 +1115,10 @@ rb_int_range_last(int argc, VALUE *argv, VALUE range) 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); n = NUM2LONG(nv); if (n < 0) { diff --git a/spec/ruby/core/range/last_spec.rb b/spec/ruby/core/range/last_spec.rb index d7ef776b42..6698686dd5 100644 --- a/spec/ruby/core/range/last_spec.rb +++ b/spec/ruby/core/range/last_spec.rb @@ -8,6 +8,12 @@ describe "Range#last" do (1..5).last(3).should == [3, 4, 5] 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 (0...0).last(2).should == [] end