diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:05:46 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-31 13:05:46 +0000 |
commit | 358b2f89742edbe295daa0f2abe8b6050ecd1357 (patch) | |
tree | 47885e8fd9b63b91298ff17f81a28907a02665dd | |
parent | fe5f585b6a0db967b2802c7f6fdaecb26388808f (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/win32ole/win32ole.c | 1 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Sep 12 07:52:59 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (EVENTSINK_Invoke): initialize result + variant value. + Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@ruby-lang.org> * 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); } @@ -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 |