merge revision(s) 17642:

shyouhei · shyouhei · commit b3afdd14bb46 · 2008-07-02T09:15:55.000Z
* 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
diff --git a/ChangeLog b/ChangeLog
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ date2time_str(date)`
`459`	`459`	`double date;`
`460`	`460`	`{`
`461`	`461`	`int y, m, d, hh, mm, ss;`
`462`		`- char szTime[20];`
	`462`	`+ char szTime[40];`
`463`	`463`	`double2time(date, &y, &m, &d, &hh, &mm, &ss);`
`464`	`464`	`sprintf(szTime,`
`465`	`465`	`"%4.4d/%02.2d/%02.2d %02.2d:%02.2d:%02.2d",`