diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 09:15:55 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-07-02 09:15:55 +0000 |
commit | b3afdd14bb46cffa3dcde1d57e04899e15659916 (patch) | |
tree | af3aef9bbe5c379cc5570633c535bbaa12cfdf77 | |
parent | 7c26006a21f2f34bec739a074bf46ed429fcee79 (diff) |
merge revision(s) 17642:
* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
some situation. [ruby-bugs-20793]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/win32ole/win32ole.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Jul 2 18:13:30 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (date2time_str): fix the overflow in + some situation. [ruby-bugs-20793] + Wed Jul 2 17:38:01 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/iconv/iconv.c (iconv_iconv): fixed backport miss. diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 84bbe03a34..662f5f1a87 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -459,7 +459,7 @@ date2time_str(date) double date; { int y, m, d, hh, mm, ss; - char szTime[20]; + char szTime[40]; double2time(date, &y, &m, &d, &hh, &mm, &ss); sprintf(szTime, "%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d", @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-07-02" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080702 -#define RUBY_PATCHLEVEL 258 +#define RUBY_PATCHLEVEL 259 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |