reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-10 22:35:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ole32: Return the buffer pointer when WdtpInterfacePointer_UserMarshal fails.

Browse Source 
Found by PVS-Studio.
This commit is contained in:
Michael Stefaniuc 2015-01-19 11:26:14 +01:00 committed by Alexandre Julliard
parent 139ebf643a
commit 514951cc11
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/ole32/tests/usrmarshal.c
View File

@ -576,6 +576,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx)
ok(size == 0, "size should be 0 bytes, not %d\n", size); ok(size == 0, "size should be 0 bytes, not %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size); buffer = HeapAlloc(GetProcessHeap(), 0, size);
buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown);
ok(buffer_end == buffer, "buffer_end %p buffer %p\n", buffer_end, buffer);
HeapFree(GetProcessHeap(), 0, buffer); HeapFree(GetProcessHeap(), 0, buffer);
/* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then

2
dlls/ole32/usrmarshal.c
View File

@ -1641,7 +1641,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea
if(CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK) if(CoMarshalInterface(stm, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL) != S_OK)
{ {
IStream_Release(stm); IStream_Release(stm);
return NULL; return pBuffer;
} }
ALIGN_POINTER(pBuffer, 3); ALIGN_POINTER(pBuffer, 3);