rpcrt4/tests: Avoid a double-free.

Commit 4cf70b14 was causing the tests to crash. The reason is due to a Wine bug in NdrPointerUnmarshall(). Windows returns the same pointer (which is later released in a call to NdrPointerFree()), while Wine makes a copy which Valgrind correctly spots is leaked.

rpcrt4/tests: Avoid a double-free.
b24ce98a · Huw Davies · Alexandre Julliard · ad9910bd · b24ce98a
Commit b24ce98a authored Apr 20, 2015 by Huw Davies Committed by Alexandre Julliard Apr 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

No files found.
--- a/dlls/rpcrt4/tests/ndr_marshall.c
+++ b/dlls/rpcrt4/tests/ndr_marshall.c
@@ -1560,6 +1560,11 @@ todo_wine {
    ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called);
 }

+    /* Prevent a memory leak when running with Wine.
+       Remove once the todo_wine block above is fixed. */
+    if (mem != mem_orig)
+        HeapFree(GetProcessHeap(), 0, mem_orig);
+
    my_free_called = 0;
    StubMsg.Buffer = StubMsg.BufferStart;
    NdrPointerFree( &StubMsg, mem, fmtstr_conf_str );
@@ -1590,7 +1595,6 @@ todo_wine {
       "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 );
    ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called);
 }
-    HeapFree(GetProcessHeap(), 0, mem_orig);

    my_alloc_called = 0;
    mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));