merge revision(s) 62572: [Backport #14549]

	date_core.c: defensive code

	* ext/date/date_core.c (f_cmp): check comparison failure.

	* ext/date/date_core.c (d_lite_step): deal with the comparison
	  result more defensively.  [ruby-core:85796] [Bug #14549]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 0 deletions

diff --git a/test/date/test_date_arith.rb b/test/date/test_date_arith.rb
index f5ac5bf30b..5b03d6e7eb 100644
--- a/test/date/test_date_arith.rb
+++ b/test/date/test_date_arith.rb
@@ -262,4 +262,17 @@ class TestDateArith < Test::Unit::TestCase
     assert_equal(8, e.to_a.size)
   end
 
+  def test_step__compare
+    o = Object.new
+    def o.<=>(*);end
+    assert_raise(ArgumentError) {
+      Date.new(2000, 1, 1).step(3, o).to_a
+    }
+
+    o = Object.new
+    def o.<=>(*);2;end
+    a = []
+    Date.new(2000, 1, 1).step(3, o) {|d| a << d}
+    assert_empty(a)
+  end
 end