diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-16 12:34:32 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-16 12:34:32 +0000 |
| commit | 67cabb2f17ef84216e2614e4131aae9e92b4cc99 (patch) | |
| tree | d6d1047df5423d990d1a468b94b94d6deae10f45 | |
| parent | 66fd410332f4a2aa009a7b6544b5637fad84842c (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_time.rb | 3 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | vsnprintf.c | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Dec 31 03:23:26 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@tenderlovemaking.com> * Use _WIN32 rather than checking for windows.h. Thanks Jon Forums! diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 13b95b94f9..520d15971c 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -632,6 +632,9 @@ class TestTime < Test::Unit::TestCase 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 @@ -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 diff --git a/vsnprintf.c b/vsnprintf.c index a1ac4424a2..697d5fce08 100644 --- a/vsnprintf.c +++ b/vsnprintf.c @@ -362,7 +362,7 @@ static char * 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 |