From 8ab6e3ae5fde899b7a8c79130290ba71b5dfbf2e Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 2 Jul 2008 09:16:48 +0000 Subject: 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_7@17797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/win32ole/win32ole.c | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d98c602d5c..eb00ea23d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 2 18:16:19 2008 Masaki Suketa + + * ext/win32ole/win32ole.c (date2time_str): fix the overflow in + some situation. [ruby-bugs-20793] + Tue Jul 1 15:11:14 2008 Nobuyoshi Nakada * array.c (rb_ary_fill): check if beg is too big. diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 7844b41ad4..94eff3aa51 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 c3b3b554e5..de370f4836 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-07-01" +#define RUBY_RELEASE_DATE "2008-07-02" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080701 -#define RUBY_PATCHLEVEL 40 +#define RUBY_RELEASE_CODE 20080702 +#define RUBY_PATCHLEVEL 41 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 2 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3