Huw Davies : rpcrt4: Actually set an unmarshalled object ptr to NULL when a NULL pointer id is received .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c74de4a1ce1eb0a68925125687414da10b2b36c5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c74de4a1ce1eb0a68925125687...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Wed Oct  1 13:43:37 2008 -0500

rpcrt4: Actually set an unmarshalled object ptr to NULL when a NULL pointer id is received.

---

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

diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
index 80e5b81..3be736d 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);