rpc: Skip over the right number of bytes in new correlation descriptors.

Skip over 6 bytes of the format descriptor if new correlation descriptors are being used, instead of 4.

rpc: Skip over the right number of bytes in new correlation descriptors.
5b629e95 · Robert Shearman · Alexandre Julliard · 98734cc8 · 5b629e95
Commit 5b629e95 authored Jan 20, 2006 by Robert Shearman Committed by Alexandre Julliard Jan 20, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

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

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -310,7 +310,10 @@ PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pForm
  pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer);
  pStubMsg->Buffer += 4;
  TRACE("unmarshalled conformance is %ld\n", pStubMsg->MaxCount);
-  return pFormat+4;
+  if (pStubMsg->fHasNewCorrDesc)
+    return pFormat+6;
+  else
+    return pFormat+4;
 }

 static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat)
@@ -330,7 +333,10 @@ static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_S
  TRACE("variance is %ld\n", pStubMsg->ActualCount);

 done:
-  return pFormat+4;
+  if (pStubMsg->fHasNewCorrDesc)
+    return pFormat+6;
+  else
+    return pFormat+4;
 }

 PFORMAT_STRING ComputeConformanceOrVariance(
@@ -444,7 +450,10 @@ done_conf_grab:

 finish_conf:
  TRACE("resulting conformance is %ld\n", *pCount);
-  return pFormat+4;
+  if (pStubMsg->fHasNewCorrDesc)
+    return pFormat+6;
+  else
+    return pFormat+4;
 }