From 358b2f89742edbe295daa0f2abe8b6050ecd1357 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 31 Oct 2009 13:05:46 +0000 Subject: merges r24855 from trunk into ruby_1_9_1. -- * ext/win32ole/win32ole.c (EVENTSINK_Invoke): initialize result variant value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/win32ole/win32ole.c | 1 + version.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 861cbbbe0d..0725bc011c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 12 07:52:59 2009 Masaki Suketa + + * ext/win32ole/win32ole.c (EVENTSINK_Invoke): initialize result + variant value. + Fri Sep 11 10:38:33 2009 URABE Shyouhei * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 86f4f2e085..11a4b91c55 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -7789,6 +7789,7 @@ STDMETHODIMP EVENTSINK_Invoke( } if (pvarResult) { + VariantInit(pvarResult); ole_val2variant(result, pvarResult); } diff --git a/version.h b/version.h index af014851ae..19a04b6e86 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 324 +#define RUBY_PATCHLEVEL 325 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3