[前][次][番号順一覧][スレッド一覧]

ruby-changes:6129

From: suke <ko1@a...>
Date: Sun, 29 Jun 2008 08:04:26 +0900 (JST)
Subject: [ruby-changes:6129] Ruby:r17641 (trunk): * ext/win32ole/win32ole.c (date2time_str): fix the overflow in

suke	2008-06-29 08:00:58 +0900 (Sun, 29 Jun 2008)

  New Revision: 17641

  Modified files:
    trunk/ChangeLog
    trunk/ext/win32ole/win32ole.c

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


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17641&r2=17640&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/win32ole/win32ole.c?r1=17641&r2=17640&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17640)
+++ ChangeLog	(revision 17641)
@@ -1,3 +1,8 @@
+Sun Jun 29 07:53:08 2008  Masaki Suketa  <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
+	  some situation. [ruby-bugs-20793]
+
 Sat Jun 28 21:25:08 2008  Tanaka Akira  <akr@f...>
 
 	* include/ruby/ruby.h (struct RRegexp): new field usecnt.  replace
Index: ext/win32ole/win32ole.c
===================================================================
--- ext/win32ole/win32ole.c	(revision 17640)
+++ ext/win32ole/win32ole.c	(revision 17641)
@@ -116,7 +116,7 @@
 
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "1.1.6"
+#define WIN32OLE_VERSION "1.1.7"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -768,12 +768,10 @@
 date2time_str(double date)
 {
     int y, m, d, hh, mm, ss;
-    char szTime[20];
     double2time(date, &y, &m, &d, &hh, &mm, &ss);
-    sprintf(szTime,
+    return rb_sprintf(
             "%04d/%02d/%02d %02d:%02d:%02d",
             y, m, d, hh, mm, ss);
-    return rb_str_new2(szTime);
 }
 
 #define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp

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

[前][次][番号順一覧][スレッド一覧]