* ext/syck/rubyext.c (mktime_do): extra digits are not used.

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

3 files changed, 37 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 46fe484e53..65bcb4aa8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri May  6 22:35:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/syck/rubyext.c (mktime_do): extra digits are not used.
+
 Fri May  6 17:43:07 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/syck/rubyext.c (mktime_do): remove unused variable offset.
diff --git a/ext/syck/rubyext.c b/ext/syck/rubyext.c
index b234efdfad..2ab2e49482 100644
--- a/ext/syck/rubyext.c
+++ b/ext/syck/rubyext.c
@@ -226,7 +226,7 @@ mktime_do(VALUE varg)
     VALUE hour = INT2FIX(0);
     VALUE min = INT2FIX(0);
     VALUE sec = INT2FIX(0);
-    double usec;
+    long usec;
 
     /* Year*/
     if ( ptr[0] != '\0' && len > 0 ) {
@@ -272,19 +272,19 @@ mktime_do(VALUE varg)
     ptr += 2;
     if ( len > ptr - str && *ptr == '.' )
     {
-        char padded[] = "000000.000000";
-        const int padding = 6;
+        char padded[] = "000000";
+        const int padding = (int)(sizeof(padded) - 1);
         const char *end = ptr + 1;
         const char *begin = end;
-        int length;
+        ptrdiff_t length;
         while ( isdigit( *end ) ) end++;
-        length = (int)(end - begin) <= padding ? (int)(end - begin) : padding;
+        if ((length = (end - begin)) > padding) length = padding;
         MEMCPY(padded, begin, char, length);
-        usec = strtod(padded, NULL);
+        usec = strtol(padded, NULL, 10);
     }
     else
     {
-        usec = 0.0;
+        usec = 0;
     }
 
     /* Time Zone*/
@@ -312,12 +312,12 @@ mktime_do(VALUE varg)
         time = rb_funcall(rb_cTime, s_utc, 6, year, mon, day, hour, min, sec);
         tmp = rb_funcall(time, s_to_i, 0);
         tmp = rb_funcall(tmp, '-', 1, LONG2FIX(tz_offset));
-        return rb_funcall(rb_cTime, s_at, 2, tmp, rb_float_new(usec));
+        return rb_funcall(rb_cTime, s_at, 2, tmp, LONG2NUM(usec));
     }
     else
     {
         /* Make UTC time*/
-        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, rb_float_new(usec));
+        return rb_funcall(rb_cTime, s_utc, 7, year, mon, day, hour, min, sec, LONG2NUM(usec));
     }
 }
 
diff --git a/test/syck/test_time.rb b/test/syck/test_time.rb
new file mode 100644
index 0000000000..e3d27121b0
--- /dev/null
+++ b/test/syck/test_time.rb
@@ -0,0 +1,24 @@
+require 'test/unit'
+require 'yaml'
+
+module Syck
+  class TestString < Test::Unit::TestCase
+    def test_usec_long
+      bug4571 = '[ruby-core:35713]'
+      assert_equal(34, YAML.load("2011-03-22t23:32:11.0000342222+01:00").usec, bug4571)
+    end
+
+    def test_usec_very_long
+      t = "2011-03-22t23:32:11.0000342"+"0"*1000+"1+01:00"
+      assert_equal(34, YAML.load(t).usec)
+    end
+
+    def test_usec_full
+      assert_equal(342222, YAML.load("2011-03-22t23:32:11.342222+01:00").usec)
+    end
+
+    def test_usec_short
+      assert_equal(330000, YAML.load("2011-03-22t23:32:11.33+01:00").usec)
+    end
+  end
+end