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

ruby-changes:16743

From: suke <ko1@a...>
Date: Sat, 24 Jul 2010 16:08:15 +0900 (JST)
Subject: [ruby-changes:16743] Ruby:r28738 (ruby_1_8): * ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.

suke	2010-07-24 15:49:35 +0900 (Sat, 24 Jul 2010)

  New Revision: 28738

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

  Log:
    * ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
      [ruby-core:31304][Bug #3576].

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/win32ole/win32ole.c

Index: ruby_1_8/ext/win32ole/win32ole.c
===================================================================
--- ruby_1_8/ext/win32ole/win32ole.c	(revision 28737)
+++ ruby_1_8/ext/win32ole/win32ole.c	(revision 28738)
@@ -79,7 +79,7 @@
 
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "0.7.8"
+#define WIN32OLE_VERSION "0.7.9"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -6125,7 +6125,6 @@
 
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     OLE_RELEASE(pTypeInfo);
-
     /* Now that would be a bad surprise, if we didn't find it, wouldn't it? */
     if (!*ppTypeInfo) {
         if (SUCCEEDED(hr))
@@ -6222,6 +6221,7 @@
         rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object");
     }
 
+    pTypeInfo = NULL;
     if(TYPE(itf) != T_NIL) {
         if (ruby_safe_level > 0 && OBJ_TAINTED(itf)) {
             rb_raise(rb_eSecurityError, "Insecure Event Creation - %s",
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28737)
+++ ruby_1_8/ChangeLog	(revision 28738)
@@ -1,3 +1,8 @@
+Sat Jul 24 15:44:29 2010  Masaki Suketa <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
+	  [ruby-core:31304][Bug #3576].
+
 Tue Jul 13 21:46:38 2010  NAKAMURA, Hiroshi  <nahi@r...>
 
 	* ext/openssl/ossl_config.c, ext/openssl/lib/openssl/config.rb,

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

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