Permalink
Browse files

Sat, 24 Jul 2010 06:49:35 +0000 suke <suke@b2dd03c8-39d4-4d8f-98ff-82…

…3fe69b080e>

 merge revision(s) 28378:
 ?\012
 	* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@29857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 8882c26 commit 8cb1d34d33002d752ce126820da44295f8472ceb @shyouhei shyouhei committed Nov 22, 2010
Showing with 8 additions and 3 deletions.
  1. +5 −0 ChangeLog
  2. +2 −2 ext/win32ole/win32ole.c
  3. +1 −1 version.h
View
@@ -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,
View
@@ -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",
View
@@ -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

0 comments on commit 8cb1d34

Please sign in to comment.