diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-19 08:29:08 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-19 08:29:08 +0000 |
| commit | 0343a11d1af1e0ac9afe9a7c91dd152991bddf08 (patch) | |
| tree | b512ff248544f9b5b0ea574385015dcdc094d90d /ext/win32ole | |
| parent | 45d282aeb06dc76904c4c2e13807fc315e0e0911 (diff) | |
revert error check-in in r11777
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
| -rw-r--r-- | ext/win32ole/win32ole.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index f0fcc11fe0..950ff21fd9 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -79,7 +79,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,8 +921,13 @@ ole_variant2val(pvar) VARIANT variant; VALUE val; VALUE val2; + int dim = 0; + + if (!psa) { + return obj; + } + dim = SafeArrayGetDim(psa); - int dim = SafeArrayGetDim(psa); VariantInit(&variant); V_VT(&variant) = (V_VT(pvar) & ~VT_ARRAY) | VT_BYREF; |