rpcrt4: Fix NdrConformantStringUnmarshall to always increment the buffer during unmarshalling.

safe_copy_from_buffer has the side-effect of incrementing the buffer and this still needs to be done when we point the memory into the buffer. (Thanks to Maarten Lankhorst for finding the mistake and suggesting a fix.)

rpcrt4: Fix NdrConformantStringUnmarshall to always increment the buffer during unmarshalling.
9a888e64 · Rob Shearman · Alexandre Julliard · aaa0e509 · 9a888e64
Commit 9a888e64 authored Dec 20, 2007 by Rob Shearman Committed by Alexandre Julliard Dec 20, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -890,7 +890,9 @@ unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg
      *ppMemory = NdrAllocate(pStubMsg, memsize);
  }

-  if (*ppMemory != pStubMsg->Buffer)
+  if (*ppMemory == pStubMsg->Buffer)
+    safe_buffer_increment(pStubMsg, bufsize);
+  else
    safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize);

  if (*pFormat == RPC_FC_C_CSTRING) {