rpcrt4: Initialise the memory in test_simple_struct_marshal before passing it to…

rpcrt4: Initialise the memory in test_simple_struct_marshal before passing it to NdrSimpleStructUnmarshall. Otherwise, the unmarshalling code will read from unintialised memory when trying to reuse the embedded pointers in the memory block. Also fix a couple of memory leaks.

rpcrt4: Initialise the memory in test_simple_struct_marshal before passing it to…
eef207e3 · Rob Shearman · Alexandre Julliard · 49a5f7cb · eef207e3
Commit eef207e3 authored Nov 30, 2007 by Rob Shearman Committed by Alexandre Julliard Dec 03, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

ndr_marshall.c dlls/rpcrt4/tests/ndr_marshall.c +3 -1

No files found.
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -514,7 +514,7 @@ todo_wine {

    StubMsg.Buffer = StubMsg.BufferStart;
    StubMsg.MemorySize = 0;
-    mem_orig = mem = HeapAlloc(GetProcessHeap(), 0, srcsize);
+    mem_orig = mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, srcsize);
    ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 );
    ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr);
    ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart);
@@ -600,6 +600,8 @@ todo_wine {
    my_alloc_called = 0;
    ok(StubMsg.MemorySize == 0, "memorysize touched in unmarshal\n");

+    HeapFree(GetProcessHeap(), 0, mem_orig);
+    HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart);
 }

 typedef struct