From c74de4a1ce1eb0a68925125687414da10b2b36c5 Mon Sep 17 00:00:00 2001
From: Huw Davies <huw@codeweavers.com>
Date: Wed, 1 Oct 2008 13:43:37 -0500
Subject: [PATCH] rpcrt4: Actually set an unmarshalled object ptr to NULL when
 a NULL pointer id is received.

---
 dlls/rpcrt4/ndr_marshall.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 80e5b81f515..3be736d1edc 100644
--- a/dlls/rpcrt4/ndr_marshall.c
+++ b/dlls/rpcrt4/ndr_marshall.c
@@ -861,7 +861,10 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg,
     if (pointer_id)
       pointer_needs_unmarshaling = 1;
     else
+    {
+      *pPointer = NULL;    
       pointer_needs_unmarshaling = 0;
+    }
     break;
   case RPC_FC_FP:
     pointer_id = NDR_LOCAL_UINT32_READ(Buffer);