From d8e467b0fd66ef6032580727b41979668e8aa4ef Mon Sep 17 00:00:00 2001 From: Rob Shearman Date: Fri, 30 Nov 2007 21:31:47 +0000 Subject: [PATCH] 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. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 8300b640e11..84a19909f76 100644 --- 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; }