File dbus-cve-2012-3524-4.patch of Package dbus-1-x11.1001

Overview Repositories Revisions Requests Users Attributes Meta

File dbus-cve-2012-3524-4.patch of Package dbus-1-x11.1001

--- a/bus/activation-helper.c	2012-10-10 15:41:47.706771251 +0200
+++ b/bus/activation-helper.c	2012-10-10 15:43:52.196814743 +0200
@@ -140,16 +140,12 @@
   return desktop_file;
 }
 
-/* Clears the environment, except for DBUS_STARTER_x */
+/* Clears the environment, except for DBUS_STARTER_x,
+ * which we hardcode to the system bus.
+ */
 static dbus_bool_t
 clear_environment (DBusError *error)
 {
-  const char *debug_env = NULL;
-  const char *starter_env = NULL;
-
-  /* we save the starter */
-  starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS");
-
 #ifndef ACTIVATION_LAUNCHER_TEST
   /* totally clear the environment */
   if (!_dbus_clearenv ())
@@ -160,11 +156,8 @@
     }
 #endif
 
-  /* restore the starter */
-  if (starter_env)
-    _dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env);
-
-  /* set the type, which must be system if we got this far */
+  /* Ensure the bus is set to system */
+  _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
   _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
 
   return TRUE;

Places

File dbus-cve-2012-3524-4.patch of Package dbus-1-x11.1001

Places