shyouhei	2008-07-02 18:15:55 +0900 (Wed, 02 Jul 2008)

  New Revision: 17795

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/win32ole/win32ole.c
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 17642:
    * ext/win32ole/win32ole.c (date2time_str): fix the overflow in
      some situation. [ruby-bugs-20793]



  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17795

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17795&r2=17794&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17795&r2=17794&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ext/win32ole/win32ole.c?r1=17795&r2=17794&diff_format=u

Index: ruby_1_8_6/ext/win32ole/win32ole.c
===================================================================
--- ruby_1_8_6/ext/win32ole/win32ole.c	(revision 17794)
+++ ruby_1_8_6/ext/win32ole/win32ole.c	(revision 17795)
@@ -459,7 +459,7 @@
     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",
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17794)
+++ ruby_1_8_6/ChangeLog	(revision 17795)
@@ -1,3 +1,8 @@
+Wed Jul  2 18:13:30 2008  Masaki Suketa  <masaki.suketa@n...>
+
+	* 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@r...>
 
 	* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17794)
+++ ruby_1_8_6/version.h	(revision 17795)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/