diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:21:48 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-22 07:21:48 +0000 |
commit | 699a20e917bebfdee75612ba1d5c244e7a395077 (patch) | |
tree | 105cc8d1fd5a3b3f9fb8d7a4e0a9ecabeb22faab | |
parent | 979f1acde0d4d15dd43a15f81ff4a75eafe8c020 (diff) |
Sat, 24 Jul 2010 06:49:35 +0000 suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
merge revision(s) 28378:
* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
[ruby-core:31304][Bug #3576].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/win32ole/win32ole.c | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Jul 24 15:44:29 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo. + [ruby-core:31304][Bug #3576]. + Tue Jul 13 21:46:38 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org> * ext/openssl/ossl_config.c, ext/openssl/lib/openssl/config.rb, diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 8d37c3559b..bc268375f5 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -78,7 +78,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*); @@ -6113,7 +6113,6 @@ find_default_source(ole, piid, ppTypeInfo) 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)) @@ -6209,6 +6208,7 @@ fev_initialize(argc, argv, self) 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", @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-11-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101122 -#define RUBY_PATCHLEVEL 306 +#define RUBY_PATCHLEVEL 307 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |