rpcrt4: Clear the memory of embedded complex types in ComplexUnmarshall when…

rpcrt4: Clear the memory of embedded complex types in ComplexUnmarshall when fMustAlloc is TRUE to avoid passing uninitialised memory to the unmarshaller. Found by Valgrind.

rpcrt4: Clear the memory of embedded complex types in ComplexUnmarshall when…
b75828fc · Rob Shearman · Alexandre Julliard · ba1a7ba6 · b75828fc
Commit b75828fc authored Jul 06, 2008 by Rob Shearman Committed by Alexandre Julliard Jul 07, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

ndr_marshall.c dlls/rpcrt4/ndr_marshall.c +7 -0

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -2426,6 +2426,13 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
      desc = pFormat + *(const SHORT*)pFormat;
      size = EmbeddedComplexSize(pStubMsg, desc);
      TRACE("embedded complex (size=%ld) => %p\n", size, pMemory);
+      if (fMustAlloc)
+        /* we can't pass fMustAlloc=TRUE into the marshaller for this type
+         * since the type is part of the memory block that is encompassed by
+         * the whole complex type. Memory is forced to allocate when pointers
+         * are set to NULL, so we emulate that part of fMustAlloc=TRUE by
+         * clearing the memory we pass in to the unmarshaller */
+        memset(pMemory, 0, size);
      m = NdrUnmarshaller[*desc & NDR_TABLE_MASK];
      if (m)
      {