From c469ec545defa6e39b3752facc6f841877ca3423 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 2 Jul 2008 09:15:55 +0000 Subject: merge revision(s) 17642: * ext/win32ole/win32ole.c (date2time_str): fix the overflow in some situation. [ruby-bugs-20793] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/win32ole/win32ole.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91020d2d3..c9e5f26a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 2 18:13:30 2008 Masaki Suketa + + * ext/win32ole/win32ole.c (date2time_str): fix the overflow in + some situation. [ruby-bugs-20793] + Wed Jul 2 17:38:01 2008 Nobuyoshi Nakada * ext/iconv/iconv.c (iconv_iconv): fixed backport miss. diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 84bbe03a3..662f5f1a8 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", diff --git a/version.h b/version.h index 5d087ab53..71fa3a20d 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit