diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-09 23:34:46 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-09 23:34:46 +0000 |
| commit | a52468eef6b0e364f2160a767fd8d9dd0ad5eabd (patch) | |
| tree | 94f2ca331d8de5fa0144825e33d06e6c990f2362 | |
| parent | 05d4bbbbda3896b206006a8c2d7cd509a94ba9bd (diff) | |
* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
SAFEARRAY pointer is NULL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 6 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Sat Feb 10 08:38:30 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (ole_variant2val): fix the bug when + SAFEARRAY pointer is NULL. + Tue Feb 6 20:41:39 2007 NAKAMURA Usaku <usa@ruby-lang.org> * string.c (rb_str_sub_bang): calling rb_str_modify() should be just diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 2335782b86..d784e866d1 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.0" +#define WIN32OLE_VERSION "0.7.1" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -921,6 +921,10 @@ ole_variant2val(pvar) VALUE val; VALUE val2; + if (!psa) { + return obj; + } + int dim = SafeArrayGetDim(psa); VariantInit(&variant); V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF; @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-02-06" +#define RUBY_RELEASE_DATE "2007-02-10" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070206 -#define RUBY_PATCHLEVEL 18 +#define RUBY_RELEASE_CODE 20070210 +#define RUBY_PATCHLEVEL 19 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 10 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |