From c64f26a28171e3e9400f027e63d02dc5af5f8ca5 Mon Sep 17 00:00:00 2001 From: akr Date: Wed, 27 Mar 2013 11:37:59 +0000 Subject: * time.c (num_exact): use to_r method only if to_int method is available. [ruby-core:53764] [Bug #8173] reported by Hiro Asari. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_time.rb | 1 + time.c | 4 +++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 42fef016fb..d85493ff68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 27 12:45:41 2013 Tanaka Akira + + * time.c (num_exact): use to_r method only if to_int method is + available. + [ruby-core:53764] [Bug #8173] reported by Hiro Asari. + Wed Mar 27 12:07:40 2013 Tanaka Akira * test/-ext-/num2int/test_num2int.rb (test_num2ll): test LLONG_MIN, diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 15b6ae5bef..22df27067f 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -351,6 +351,7 @@ class TestTime < Test::Unit::TestCase end assert_raise(ArgumentError) { Time.gm(2000, 1, 1, 0, 0, -(2**31), :foo, :foo) } o = Object.new + def o.to_int; 0; end def o.to_r; nil; end assert_raise(TypeError) { Time.gm(2000, 1, 1, 0, 0, o, :foo, :foo) } def o.to_r; ""; end diff --git a/time.c b/time.c index b89665ccda..14f29118ac 100644 --- a/time.c +++ b/time.c @@ -683,7 +683,9 @@ num_exact(VALUE v) default: if ((tmp = rb_check_funcall(v, rb_intern("to_r"), 0, NULL)) != Qundef) { - if (rb_respond_to(v, rb_intern("to_str"))) goto typeerror; + /* test to_int method availability to reject non-Numeric + * objects such as String, Time, etc which have to_r method. */ + if (!rb_respond_to(v, rb_intern("to_int"))) goto typeerror; v = tmp; break; } -- cgit v1.2.3