Robert Shearman : rpcrt4: Fix the unmarshaling of pointers in conformant varying arrays,

[Alexandre Julliard]

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

Author: Robert Shearman 
Date:   Fri Jun  2 20:42:44 2006 +0100

rpcrt4: Fix the unmarshaling of pointers in conformant varying arrays,
by passing the correct type format string to ReadConformance.

---

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

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index c714017..90c19c9 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -2275,7 +2275,7 @@ unsigned char* WINAPI NdrConformantVaryi
         return NULL;
     }

-    pFormat = ReadConformance(pStubMsg, pFormat);
+    pFormat = ReadConformance(pStubMsg, pFormat+4);
     pFormat = ReadVariance(pStubMsg, pFormat);

ALIGN_POINTER(pStubMsg->Buffer, alignment);