rpcrt4: Reverse the conditions for which *pPointer is assigned base_ptr_val in PointerUnmarshall.

In one condition (fMustAlloc == TRUE), base_ptr_val may be uninitialised and so cause a valgrind warning. Reversing the check is harmless and doesn't result in a performance decrease.

rpcrt4: Reverse the conditions for which *pPointer is assigned base_ptr_val in PointerUnmarshall.
d8e467b0 · Rob Shearman · Alexandre Julliard · eef207e3 · d8e467b0
Commit d8e467b0 authored Nov 30, 2007 by Rob Shearman Committed by Alexandre Julliard Dec 03, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -1061,7 +1061,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
    /* this must be done after the call to the unmarshaller, since when we are
     * unmarshalling reference pointers on the server side *pPointer will be
     * pointing to valid data */
-    if (base_ptr_val && (!fMustAlloc || attr & RPC_FC_P_DEREF))
+    if ((!fMustAlloc || attr & RPC_FC_P_DEREF) && base_ptr_val)
      *pPointer = base_ptr_val;
  }