Changeset 21166 in vbox for trunk

Timestamp:

Jul 2, 2009 2:09:34 PM (16 years ago)

Author:

vboxsync

Message:

VBoxServiceVMInfo.cpp: Don't crash in the termination code if init fails.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -110 +110 @@
 
     int rc = RTSemEventMultiCreate(&g_VMInfoEvent);
-    AssertRC(rc);
+    AssertRCReturn(rc, rc);
 
 #ifdef RT_OS_WINDOWS
@@ -123 +123 @@
 
     rc = VbglR3GuestPropConnect(&g_VMInfoGuestPropSvcClientID);
-    if (!RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
+        VBoxServiceVerbose(3, "Property Service Client ID: %#x\n", g_VMInfoGuestPropSvcClientID);
+    else
     {
         VBoxServiceError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
-    }
-    else
-    {
-        VBoxServiceVerbose(3, "Property Service Client ID: %ld\n", g_VMInfoGuestPropSvcClientID);
+        RTSemEventMultiDestroy(g_VMInfoEvent);
+        g_VMInfoEvent = NIL_RTSEMEVENTMULTI;
     }
 
@@ -437 +437 @@
     int rc;
 
-    /** @todo temporary solution: Zap all values which are not valid
-     *        anymore when VM goes down (reboot/shutdown ). Needs to
-     *        be replaced with "temporary properties" later. */
-    rc = VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsersList", NULL);
-    rc = VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsers", 0);
-    if (g_VMInfoLoggedInUsers > 0)
-        VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/NoLoggedInUsers", "true");
-
-    const char *apszPat[1] = { "/VirtualBox/GuestInfo/Net/*" };
-    rc = VbglR3GuestPropDelSet(g_VMInfoGuestPropSvcClientID, &apszPat[0], RT_ELEMENTS(apszPat));
-    rc = VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/Net/Count", 0);
-
-    /* Disconnect from guest properties service. */
-    rc = VbglR3GuestPropDisconnect(g_VMInfoGuestPropSvcClientID);
-    if (RT_FAILURE(rc))
-        VBoxServiceError("Failed to disconnect from guest property service! Error: %Rrc\n", rc);
-
     if (g_VMInfoEvent != NIL_RTSEMEVENTMULTI)
     {
+        /** @todo temporary solution: Zap all values which are not valid
+         *        anymore when VM goes down (reboot/shutdown ). Needs to
+         *        be replaced with "temporary properties" later.
+         *
+         *  @todo r=bird: This code isn't called on non-Windows systems. We need
+         *        a more formal way of shutting down the service for that to work.
+         */
+        rc = VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsersList", NULL);
+        rc = VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/LoggedInUsers", 0);
+        if (g_VMInfoLoggedInUsers > 0)
+            VboxServiceWriteProp(g_VMInfoGuestPropSvcClientID, "GuestInfo/OS/NoLoggedInUsers", "true");
+
+        const char *apszPat[1] = { "/VirtualBox/GuestInfo/Net/*" };
+        rc = VbglR3GuestPropDelSet(g_VMInfoGuestPropSvcClientID, &apszPat[0], RT_ELEMENTS(apszPat));
+        rc = VboxServiceWritePropInt(g_VMInfoGuestPropSvcClientID, "GuestInfo/Net/Count", 0);
+
+        /* Disconnect from guest properties service. */
+        rc = VbglR3GuestPropDisconnect(g_VMInfoGuestPropSvcClientID);
+        if (RT_FAILURE(rc))
+            VBoxServiceError("Failed to disconnect from guest property service! Error: %Rrc\n", rc);
+        g_VMInfoGuestPropSvcClientID = 0;
+
+
         RTSemEventMultiDestroy(g_VMInfoEvent);
         g_VMInfoEvent = NIL_RTSEMEVENTMULTI;