ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Fix leak in typelib marshaler when invoking IDispatch methods.

Browse Source
This commit is contained in:
Octavian Voicu 2011-08-25 18:50:20 +03:00 committed by Alexandre Julliard
parent 82ef9f960d
commit 8177b4793a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/oleaut32/tests/tmarshal.c
View File

@ -1000,6 +1000,12 @@ static void test_typelibmarshal(void)
IKindaEnumWidget_Release(pKEW); IKindaEnumWidget_Release(pKEW);
/* call GetTypeInfoCount (direct) */
hr = IWidget_GetTypeInfoCount(pWidget, &uval);
ok_ole_success(hr, IWidget_GetTypeInfoCount);
hr = IWidget_GetTypeInfoCount(pWidget, &uval);
ok_ole_success(hr, IWidget_GetTypeInfoCount);
hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch); hr = IWidget_QueryInterface(pWidget, &IID_IDispatch, (void **)&pDispatch);
ok_ole_success(hr, IWidget_QueryInterface); ok_ole_success(hr, IWidget_QueryInterface);

19
dlls/oleaut32/tmarshal.c
View File

@ -2002,16 +2002,19 @@ TMStubImpl_Invoke(
if (This->dispatch_derivative && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *)) if (This->dispatch_derivative && xmsg->iMethod < sizeof(IDispatchVtbl)/sizeof(void *))
{ {
IPSFactoryBuffer *factory_buffer; if (!This->dispatch_stub)
hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer);
if (hres == S_OK)
{ {
hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch, IPSFactoryBuffer *factory_buffer;
This->pUnk, &This->dispatch_stub); hres = get_facbuf_for_iid(&IID_IDispatch, &factory_buffer);
IPSFactoryBuffer_Release(factory_buffer); if (hres == S_OK)
{
hres = IPSFactoryBuffer_CreateStub(factory_buffer, &IID_IDispatch,
This->pUnk, &This->dispatch_stub);
IPSFactoryBuffer_Release(factory_buffer);
}
if (hres != S_OK)
return hres;
} }
if (hres != S_OK)
return hres;
return IRpcStubBuffer_Invoke(This->dispatch_stub, xmsg, rpcchanbuf); return IRpcStubBuffer_Invoke(This->dispatch_stub, xmsg, rpcchanbuf);
} }