Robert Shearman : rpcrt4: Set BufferMark before calling EmbeddedPointerMarshall, EmbeddedPointerUnmarshall or EmbeddedPointerMemorySize.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 5700fe8a61c1113a074f394e3fa2fea9c185398c
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=5700fe8a61c1113a074f394e...

Author: Robert Shearman 
Date:   Mon Jul 24 11:46:03 2006 +0100

rpcrt4: Set BufferMark before calling EmbeddedPointerMarshall, EmbeddedPointerUnmarshall or EmbeddedPointerMemorySize.

---

dlls/rpcrt4/ndr_marshall.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 179d933..ac8d52c 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -3555,7 +3555,9 @@ unsigned char *  WINAPI NdrFixedArrayMar
         total_size = pLgFArrayFormat->total_size;
         pFormat = (unsigned char *)(pLgFArrayFormat + 1);
     }
+
     memcpy(pStubMsg->Buffer, pMemory, total_size);
+    pStubMsg->BufferMark = pStubMsg->Buffer;
     pStubMsg->Buffer += total_size;

pFormat = EmbeddedPointerMarshall(pStubMsg, pMemory, pFormat);
@@ -3601,6 +3603,7 @@ unsigned char *  WINAPI NdrFixedArrayUnm
     if (fMustAlloc || !*ppMemory)
         *ppMemory = NdrAllocate(pStubMsg, total_size);
     memcpy(*ppMemory, pStubMsg->Buffer, total_size);
+    pStubMsg->BufferMark = pStubMsg->Buffer;
     pStubMsg->Buffer += total_size;

pFormat = EmbeddedPointerUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc);
@@ -3678,6 +3681,7 @@ unsigned long WINAPI NdrFixedArrayMemory
         total_size = pLgFArrayFormat->total_size;
         pFormat = (unsigned char *)(pLgFArrayFormat + 1);
     }
+    pStubMsg->BufferMark = pStubMsg->Buffer;
     pStubMsg->Buffer += total_size;
     pStubMsg->MemorySize += total_size;