Skip to content

W
wine-winehq
Commit 68b92250 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

rpcrt4: Clear the newly allocated memory used for complex arrays and structs.

parent a4000349
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
dlls/rpcrt4/ndr_marshall.c
View file @ 68b92250
...@@ -1767,7 +1767,10 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, ...@@ -1767,7 +1767,10 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc);
if (fMustAlloc || !*ppMemory) if (fMustAlloc || !*ppMemory)
{
*ppMemory = NdrAllocate(pStubMsg, size); *ppMemory = NdrAllocate(pStubMsg, size);
memset(*ppMemory, 0, size);
}
pFormat += 4; pFormat += 4;
if (*(const WORD*)pFormat) conf_array = pFormat + *(const WORD*)pFormat; if (*(const WORD*)pFormat) conf_array = pFormat + *(const WORD*)pFormat;
...@@ -2170,7 +2173,10 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, ...@@ -2170,7 +2173,10 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
esize = ComplexStructSize(pStubMsg, pFormat); esize = ComplexStructSize(pStubMsg, pFormat);
if (fMustAlloc || !*ppMemory) if (fMustAlloc || !*ppMemory)
{
*ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize); *ppMemory = NdrAllocate(pStubMsg, pStubMsg->MaxCount * esize);
memset(*ppMemory, 0, pStubMsg->MaxCount * esize);
}
pMemory = *ppMemory; pMemory = *ppMemory;
for (count = 0; count < pStubMsg->ActualCount; count++) for (count = 0; count < pStubMsg->ActualCount; count++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment