merge revision(s) b176315827d1082f43628013a7d89fda02724d33: [Backport #20324] (#10329)

[Bug #20324] Uncomparable ranges are not overlapping

3 files changed, 13 insertions, 3 deletions

diff --git a/range.c b/range.c
index 2aa1bde1ad..f66d23d07b 100644
--- a/range.c
+++ b/range.c
@@ -2373,8 +2373,16 @@ range_overlap(VALUE range, VALUE other)
     if (empty_region_p(self_beg, other_end, other_excl)) return Qfalse;
     if (empty_region_p(other_beg, self_end, self_excl)) return Qfalse;
 
-    /* if both begin values are equal, no more comparisons needed */
-    if (rb_equal(self_beg, other_beg)) return Qtrue;
+    if (!NIL_P(self_beg) && !NIL_P(other_beg)) {
+        VALUE cmp = rb_funcall(self_beg, id_cmp, 1, other_beg);
+        if (NIL_P(cmp)) return Qfalse;
+        /* if both begin values are equal, no more comparisons needed */
+        if (rb_cmpint(cmp, self_beg, other_beg) == 0) return Qtrue;
+    }
+    else if (NIL_P(self_beg) && NIL_P(other_beg)) {
+        VALUE cmp = rb_funcall(self_end, id_cmp, 1, other_end);
+        return RBOOL(!NIL_P(cmp));
+    }
 
     if (empty_region_p(self_beg, self_end, self_excl)) return Qfalse;
     if (empty_region_p(other_beg, other_end, other_excl)) return Qfalse;
diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb
index fe14bb9b3b..2aa69dc6a4 100644
--- a/test/ruby/test_range.rb
+++ b/test/ruby/test_range.rb
@@ -1265,6 +1265,8 @@ class TestRange < Test::Unit::TestCase
     assert_operator(0.., :overlap?, 1..)
 
     assert_not_operator((1..3), :overlap?, ('a'..'d'))
+    assert_not_operator((1..), :overlap?, ('a'..))
+    assert_not_operator((..1), :overlap?, (..'a'))
 
     assert_raise(TypeError) { (0..).overlap?(1) }
     assert_raise(TypeError) { (0..).overlap?(nil) }
diff --git a/version.h b/version.h
index 5c45d2229c..499dc4ae20 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 19
+#define RUBY_PATCHLEVEL 20
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"