rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall…

rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall if it is an out-only or return one. Fix the indentation and add tracing of the context handle flags.

rpcrt4: Only initialise the context handle to NULL in NdrContextHandleUnmarshall…
a4b18699 · Rob Shearman · Alexandre Julliard · 6ec9e0c7 · a4b18699
Commit a4b18699 authored Jan 17, 2008 by Rob Shearman Committed by Alexandre Julliard Jan 17, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

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

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -6207,6 +6207,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall(
        ERR("invalid format type %x\n", *pFormat);
        RpcRaiseException(RPC_S_INTERNAL_ERROR);
    }
+    TRACE("flags: 0x%02x\n", pFormat[1]);

    if (pFormat[1] & 0x80)
        NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE);
@@ -6225,16 +6226,22 @@ static unsigned char *WINAPI NdrContextHandleUnmarshall(
    PFORMAT_STRING pFormat,
    unsigned char fMustAlloc)
 {
+    TRACE("pStubMsg %p, ppMemory %p, pFormat %p, fMustAlloc %s\n", pStubMsg,
+        ppMemory, pFormat, fMustAlloc ? "TRUE": "FALSE");
+
    if (*pFormat != RPC_FC_BIND_CONTEXT)
    {
        ERR("invalid format type %x\n", *pFormat);
        RpcRaiseException(RPC_S_INTERNAL_ERROR);
    }
+    TRACE("flags: 0x%02x\n", pFormat[1]);

-  **(NDR_CCONTEXT **)ppMemory = NULL;
-  NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle);
+    /* [out]-only or [ret] param */
+    if ((pFormat[1] & 0x60) == 0x20)
+        **(NDR_CCONTEXT **)ppMemory = NULL;
+    NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle);

-  return NULL;
+    return NULL;
 }

 /***********************************************************************