rpcrt4: Fix the memory pointer passed into the conformant array marshaller in…

rpcrt4: Fix the memory pointer passed into the conformant array marshaller in NdrComplexStructMarshall. It needs to be the end of the memory used by the constant part of the structure, which is returned by CompkexStructMarshall.

rpcrt4: Fix the memory pointer passed into the conformant array marshaller in…
8af1dba5 · Rob Shearman · Alexandre Julliard · 7f741f04 · 8af1dba5
Commit 8af1dba5 authored Jul 15, 2008 by Rob Shearman Committed by Alexandre Julliard Jul 16, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -2858,7 +2858,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg,

  pStubMsg->Memory = pMemory;

-  ComplexMarshall(pStubMsg, pMemory, pFormat, pointer_desc);
+  pMemory = ComplexMarshall(pStubMsg, pMemory, pFormat, pointer_desc);

  if (conf_array)
    NdrConformantArrayMarshall(pStubMsg, pMemory, conf_array);