archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r30435 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2011-01-16 12:34:32 +00:00
parent 66fd410332
commit 67cabb2f17
4 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Wed Jan 5 12:10:08 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* Use _WIN32 rather than checking for windows.h. Thanks Jon Forums! * Use _WIN32 rather than checking for windows.h. Thanks Jon Forums!

3
test/ruby/test_time.rb
View file

@ -632,6 +632,9 @@ class TestTime < Test::Unit::TestCase
t.strftime("%m/%d/%Y %l:%M:%S.%9N")) t.strftime("%m/%d/%Y %l:%M:%S.%9N"))
assert_equal("03/14/1592 6:53:58.97932384", assert_equal("03/14/1592 6:53:58.97932384",
t.strftime("%m/%d/%Y %l:%M:%S.%8N")) t.strftime("%m/%d/%Y %l:%M:%S.%8N"))
# [ruby-core:33985]
assert_equal("3000000000", Time.at(3000000000).strftime('%s'))
end end
def test_delegate def test_delegate

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 142 #define RUBY_PATCHLEVEL 143
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1

2
vsnprintf.c
View file

@ -362,7 +362,7 @@ static char *
BSD__uqtoa(register u_quad_t val, char *endp, int base, int octzero, const char *xdigs) BSD__uqtoa(register u_quad_t val, char *endp, int base, int octzero, const char *xdigs)
{ {
register char *cp = endp; register char *cp = endp;
register long sval; register quad_t sval;
/* /*
* Handle the three cases separately, in the hope of getting * Handle the three cases separately, in the hope of getting