From d9159093a585a7e85ab5542ead51ad891891f4a5 Mon Sep 17 00:00:00 2001
From: Alberto Massari <alby@exln.com>
Date: Fri, 8 Nov 2002 18:52:34 +0000
Subject: [PATCH] Avoid crashing when releasing an NdrCStdStubBuffer that had
 been previously disconnected.

---
 dlls/rpcrt4/cstub.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
index 56dc7cee565..c37d1f28e32 100644
--- a/dlls/rpcrt4/cstub.c
+++ b/dlls/rpcrt4/cstub.c
@@ -95,8 +95,10 @@ ULONG WINAPI NdrCStdStubBuffer_Release(LPRPCSTUBBUFFER iface,
   TRACE("(%p)->Release()\n",This);
 
   if (!--(This->RefCount)) {
-    IUnknown_Release(This->pvServerObject);
-    IPSFactoryBuffer_Release(This->pPSFactory);
+    if(This->pvServerObject)
+        IUnknown_Release(This->pvServerObject);
+    if(This->pPSFactory)
+        IPSFactoryBuffer_Release(This->pPSFactory);
     HeapFree(GetProcessHeap(),0,This);
     return 0;
   }