rpcrt4: Don't copy memory from the buffer in NdrConformantStringUnmarshall if we…

rpcrt4: Don't copy memory from the buffer in NdrConformantStringUnmarshall if we just pointed the memory pointer into the buffer. (Reported by Dan Kegel.)

rpcrt4: Don't copy memory from the buffer in NdrConformantStringUnmarshall if we…
b9c92e95 · Rob Shearman · Alexandre Julliard · 8d6d9fd3 · b9c92e95
Commit b9c92e95 authored Dec 17, 2007 by Rob Shearman Committed by Alexandre Julliard Dec 18, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

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

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

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

  if (*pFormat == RPC_FC_C_CSTRING) {
    TRACE("string=%s\n", debugstr_a((char*)*ppMemory));