Zebediah Figura : rpcrt4: Clarify local variables in PointerUnmarshall().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 61fdcfdd368cf2781c5fdbb0e9870efc188abee4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=61fdcfdd368cf2781c5fdbb0e...

Author: Zebediah Figura 
Date:   Sun Oct 28 17:25:48 2018 -0500

rpcrt4: Clarify local variables in PointerUnmarshall().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/rpcrt4/ndr_marshall.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 2364301..aeac0cf 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -950,26 +950,25 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
        * whether we have to initialise it so we can use the optimisation of
        * setting the pointer to the buffer, if possible, or set fMustAlloc to
        * TRUE. */
-      if (attr & FC_POINTER_DEREF) {
+      if (attr & FC_POINTER_DEREF)
+      {
         if (pSrcPointer && (attr & FC_ALLOCED_ON_STACK))
           *pPointer = pSrcPointer;
         else
           fMustAlloc = TRUE;
-      } else {
-        *current_ptr = NULL;
       }
+      else
+        *pPointer = NULL;
     }

if (attr & FC_ALLOCATE_ALL_NODES)
         FIXME("FC_ALLOCATE_ALL_NODES not implemented\n");

if (attr & FC_POINTER_DEREF) {
-      if (fMustAlloc) {
-        unsigned char *base_ptr_val = NdrAllocate(pStubMsg, sizeof(void *));
-        *pPointer = base_ptr_val;
-        current_ptr = (unsigned char **)base_ptr_val;
-      } else
-        current_ptr = *(unsigned char***)current_ptr;
+      if (fMustAlloc)
+        *pPointer = NdrAllocateZero(pStubMsg, sizeof(void *));
+
+      current_ptr = *(unsigned char***)current_ptr;
       TRACE("deref => %p\n", current_ptr);
       if (!fMustAlloc && !*current_ptr) fMustAlloc = TRUE;
     }