diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-24 13:11:21 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-24 13:11:21 +0000 |
| commit | c6f46e857d536956fd5b700f3c7afeb846c41e16 (patch) | |
| tree | bfafc9d220dfb6bc773db03e8147fce5e1e0ef42 /ext/win32ole/win32ole.c | |
| parent | 0cb863eeb10408fbbd30c82c428e578db105864a (diff) | |
| download | ruby-c6f46e857d536956fd5b700f3c7afeb846c41e16.tar.gz ruby-c6f46e857d536956fd5b700f3c7afeb846c41e16.tar.xz ruby-c6f46e857d536956fd5b700f3c7afeb846c41e16.zip | |
* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
[ruby-bugs-20792]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole/win32ole.c')
| -rw-r--r-- | ext/win32ole/win32ole.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index bb9098f25..0f8b7791d 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -116,7 +116,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.1.4" +#define WIN32OLE_VERSION "1.1.5" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -264,6 +264,7 @@ static UINT ole_encoding2cp(rb_encoding *enc); static UINT ole_init_cp(); static char *ole_wc2mb(LPWSTR pw); static VALUE ole_hresult2msg(HRESULT hr); +static void ole_freeexceptinfo(EXCEPINFO *pExInfo); static VALUE ole_excepinfo2msg(EXCEPINFO *pExInfo); static void ole_raise(HRESULT hr, VALUE ecs, const char *fmt, ...); static void ole_initialize(); @@ -963,6 +964,14 @@ ole_hresult2msg(HRESULT hr) return msg; } +static void +ole_freeexceptinfo(EXCEPINFO *pExInfo) +{ + SysFreeString(pExInfo->bstrDescription); + SysFreeString(pExInfo->bstrSource); + SysFreeString(pExInfo->bstrHelpFile); +} + static VALUE ole_excepinfo2msg(EXCEPINFO *pExInfo) { @@ -1001,9 +1010,7 @@ ole_excepinfo2msg(EXCEPINFO *pExInfo) } if(pSource) free(pSource); if(pDescription) free(pDescription); - SysFreeString(pExInfo->bstrDescription); - SysFreeString(pExInfo->bstrSource); - SysFreeString(pExInfo->bstrHelpFile); + ole_freeexceptinfo(pExInfo); return error_msg; } @@ -3167,6 +3174,9 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket) param = rb_ary_entry(paramS, i-cNamedArgs); ole_val2variant(param, &op.dp.rgvarg[n]); } + if (hr == DISP_E_EXCEPTION) { + ole_freeexceptinfo(&excepinfo); + } memset(&excepinfo, 0, sizeof(EXCEPINFO)); VariantInit(&result); hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, @@ -3179,6 +3189,9 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket) * hResult == DISP_E_EXCEPTION. this only happens on * functions whose DISPID > 0x8000 */ if ((hr == DISP_E_EXCEPTION || hr == DISP_E_MEMBERNOTFOUND) && DispID > 0x8000) { + if (hr == DISP_E_EXCEPTION) { + ole_freeexceptinfo(&excepinfo); + } memset(&excepinfo, 0, sizeof(EXCEPINFO)); hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, &IID_NULL, lcid, wFlags, @@ -3200,6 +3213,9 @@ ole_invoke(int argc, VALUE *argv, VALUE self, USHORT wFlags, BOOL is_bracket) param = rb_ary_entry(paramS, i-cNamedArgs); ole_val2variant2(param, &op.dp.rgvarg[n]); } + if (hr == DISP_E_EXCEPTION) { + ole_freeexceptinfo(&excepinfo); + } memset(&excepinfo, 0, sizeof(EXCEPINFO)); VariantInit(&result); hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID, |