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.
This commit is contained in:
Rob Shearman 2007-11-30 21:31:47 +00:00 committed by Alexandre Julliard
parent eef207e3f1
commit d8e467b0fd
1 changed files with 1 additions and 1 deletions

View File

@ -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 /* this must be done after the call to the unmarshaller, since when we are
* unmarshalling reference pointers on the server side *pPointer will be * unmarshalling reference pointers on the server side *pPointer will be
* pointing to valid data */ * 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; *pPointer = base_ptr_val;
} }