Merge pull request #6432 from kares/backport-strptime-java-error

[fix] Date._strptime raises Java exception on invalid argument
jruby · Oct 9, 2020 · 48e7c10 · 48e7c10
2 parents b9d2c1e + e45a9ad
commit 48e7c10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ext/date/RubyDate.java b/core/src/main/java/org/jruby/ext/date/RubyDate.java
@@ -1681,7 +1681,8 @@ public static IRubyObject _strptime(ThreadContext context, IRubyObject self, IRu
 
     @JRubyMethod(meta = true)
     public static IRubyObject _strptime(ThreadContext context, IRubyObject self, IRubyObject string, IRubyObject format) {
-        format = TypeConverter.checkStringType(context.runtime, format);
+        string = string.convertToString();
+        format = format.convertToString();
         return parse(context, string, ((RubyString) format).decodeString());
     }
 

diff --git a/test/jruby/test_time.rb b/test/jruby/test_time.rb
@@ -213,4 +213,10 @@ def test_div
     end
   end
 
+  def test_strptime_type_error
+    assert_raise(TypeError) { Time.strptime(0, '%Y-%m-%d') }
+    assert_raise(TypeError) { Time.strptime(nil, '%Y-%m-%d') }
+    assert_raise(TypeError) { Time.strptime('2020-01-01', 0) }
+    assert_raise(TypeError) { Time.strptime('2020-01-01', nil) }
+  end
 end