yugui	2011-01-16 21:34:32 +0900 (Sun, 16 Jan 2011)

  New Revision: 30562

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30562

  Log:
    merges r30435 from trunk into ruby_1_9_2.
    --
    * vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
      patched by Peter Weldon <peter.weldon AT null.net>
      [ruby-core:33985]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/ruby/test_time.rb
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vsnprintf.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30561)
+++ ruby_1_9_2/ChangeLog	(revision 30562)
@@ -1,3 +1,9 @@
+Fri Dec 31 03:23:26 2010  NARUSE, Yui  <naruse@r...>
+
+	* vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
+	  patched by Peter Weldon <peter.weldon AT null.net>
+	  [ruby-core:33985]
+
 Wed Jan  5 12:10:08 2011  Aaron Patterson <aaron@t...>
 
 	* Use _WIN32 rather than checking for windows.h.  Thanks Jon Forums!
Index: ruby_1_9_2/vsnprintf.c
===================================================================
--- ruby_1_9_2/vsnprintf.c	(revision 30561)
+++ ruby_1_9_2/vsnprintf.c	(revision 30562)
@@ -362,7 +362,7 @@
 BSD__uqtoa(register u_quad_t val, char *endp, int base, int octzero, const char *xdigs)
 {
 	register char *cp = endp;
-	register long sval;
+	register quad_t sval;
 
 	/*
 	 * Handle the three cases separately, in the hope of getting
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30561)
+++ ruby_1_9_2/version.h	(revision 30562)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 142
+#define RUBY_PATCHLEVEL 143
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/ruby/test_time.rb
===================================================================
--- ruby_1_9_2/test/ruby/test_time.rb	(revision 30561)
+++ ruby_1_9_2/test/ruby/test_time.rb	(revision 30562)
@@ -632,6 +632,9 @@
                  t.strftime("%m/%d/%Y %l:%M:%S.%9N"))
     assert_equal("03/14/1592  6:53:58.97932384",
                  t.strftime("%m/%d/%Y %l:%M:%S.%8N"))
+
+    # [ruby-core:33985]
+    assert_equal("3000000000", Time.at(3000000000).strftime('%s'))
   end
 
   def test_delegate

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/