Changeset 53874 in vbox

Timestamp:

Jan 20, 2015 6:47:06 PM (10 years ago)

Author:

vboxsync

Message:

VBoxService: fix a memory leak if libdbus exists but the dbus daemon isn't running

File:

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

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

@@ -598 +598 @@
     DBusConnection *pConnection = NULL;
     int rc2 = RTDBusLoadLib();
+    bool fHaveLibDbus = false;
     if (RT_SUCCESS(rc2))
     {
         /* Handle desktop sessions using ConsoleKit. */
         VBoxServiceVerbose(4, "Checking ConsoleKit sessions ...\n");
-
+        fHaveLibDbus = true;
         dbus_error_init(&dbErr);
         pConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbErr);
@@ -792 +793 @@
             s_iBitchedAboutDBus++;
             VBoxServiceError("Unable to connect to system D-Bus (%d/3): %s\n", s_iBitchedAboutDBus,
-                             pConnection && dbus_error_is_set(&dbErr) ? dbErr.message : "D-Bus not installed");
-        }
-    }
-
-    if (   pConnection
+                             fHaveLibDbus && dbus_error_is_set(&dbErr) ? dbErr.message : "D-Bus not installed");
+        }
+    }
+
+    if (   fHaveLibDbus
         && dbus_error_is_set(&dbErr))
         dbus_error_free(&dbErr);