Changeset 50076 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 14, 2014 8:49:41 AM (11 years ago)

Author:

vboxsync

Message:

VBoxCredProv: Added some more interface checks.

File:

• trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/VBoxCredProv/VBoxCredentialProvider.cpp

@@ -42 +42 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-static LONG g_cDllRefs  = 0;            /**< Global DLL reference count. */
-static HINSTANCE g_hDllInst = NULL;     /**< Global DLL hInstance. */
+static LONG g_cDllRefs  = 0;                 /**< Global DLL reference count. */
+static HINSTANCE g_hDllInst = NULL;          /**< Global DLL hInstance. */
 
 #ifdef VBOX_WITH_SENS
 static bool g_fSENSEnabled = false;
-static IEventSystem *g_pIEventSystem;   /**< Pointer to IEventSystem interface. */
+static IEventSystem *g_pIEventSystem = NULL; /**< Pointer to IEventSystem interface. */
 
 /**
@@ -182 +182 @@
     LONG m_cRefs;
 };
-static VBoxCredProvSensLogon *g_pISensLogon;
+static VBoxCredProvSensLogon *g_pISensLogon = NULL;
 
 
@@ -213 +213 @@
     }
 
-    if (SUCCEEDED(hr))
+    if (   SUCCEEDED(hr)
+        && g_pIEventSystem)
     {
         IEventSubscription *pIEventSubscription;
@@ -292 +293 @@
         VBoxCredProvVerbose(0, "VBoxCredentialProviderRegisterSENS: Error registering SENS provider, hr=%Rhrc\n", hr);
         if (g_pIEventSystem)
+        {
             g_pIEventSystem->Release();
-    }
-
+            g_pIEventSystem = NULL;
+        }
+    }
+
+    VBoxCredProvVerbose(0, "VBoxCredentialProviderRegisterSENS: Returning hr=%Rhrc\n", hr);
     return hr;
 }
@@ -304 +309 @@
 {
     if (g_pIEventSystem)
+    {
         g_pIEventSystem->Release();
+        g_pIEventSystem = NULL;
+    }
 
     /* We need to reconnecto to the event system because we can be called
      * in a different context COM can't handle. */
-    HRESULT hr = CoCreateInstance(CLSID_CEventSystem, 0, CLSCTX_SERVER, IID_IEventSystem, (void**)&g_pIEventSystem);
-    if (SUCCEEDED(hr))
+    HRESULT hr = CoCreateInstance(CLSID_CEventSystem, 0,
+                                  CLSCTX_SERVER, IID_IEventSystem, (void**)&g_pIEventSystem);
+    if (   SUCCEEDED(hr)
+        && g_pIEventSystem)
     {
         VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS\n");
@@ -346 +356 @@
 
         g_pIEventSystem->Release();
+        g_pIEventSystem = NULL;
     }
 
     if (g_pISensLogon)
+    {
         delete g_pISensLogon;
+        g_pISensLogon = NULL;
+    }
+
+    VBoxCredProvVerbose(0, "VBoxCredentialProviderUnregisterSENS: Returning hr=%Rhrc\n", hr);
 }
 #endif /* VBOX_WITH_SENS */