[Pkg-utopia-commits] r1125 - in packages/unstable/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-11-06 22:09:52 +0100 (Mon, 06 Nov 2006)
New Revision: 1125

Added:
   packages/unstable/dbus/debian/patches/40_dbus_launch_get_uuid.patch
Modified:
   packages/unstable/dbus/debian/changelog
Log:
* patches/40_dbus_launch_get_uuid.patch
  + Added. Check if get_machine_uuid() returns NULL before proceeding any
   further: we can't init the X atoms or create a session file name if there 
   is no machine ID. Solves a dbus-launch crash. (Closes: #3395938)

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-11-06 20:55:02 UTC (rev 1124)
+++ packages/unstable/dbus/debian/changelog	2006-11-06 21:09:52 UTC (rev 1125)
@@ -1,11 +1,18 @@
 dbus (0.94-2) unstable; urgency=low
 
+  [ Sebastian Dröge ]
   * debian/patches/30_dbus_send_close_shared_connection.patch:
     + Don't close shared connection in dbus-send. (Closes: 395358)
       Patch from upstream CVS
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Thu,  2 Nov 2006 23:55:31 +0100
+  [ Sjoerd Simons ]
+  * patches/40_dbus_launch_get_uuid.patch
+    + Added. Check if get_machine_uuid() returns NULL before proceeding any
+     further: we can't init the X atoms or create a session file name if there 
+     is no machine ID. Solves a dbus-launch crash. (Closes: #3395938)
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon,  6 Nov 2006 22:02:19 +0100
+
 dbus (0.94-1) unstable; urgency=low
 
   [ Riccardo Setti ]

Added: packages/unstable/dbus/debian/patches/40_dbus_launch_get_uuid.patch
===================================================================
--- packages/unstable/dbus/debian/patches/40_dbus_launch_get_uuid.patch	2006-11-06 20:55:02 UTC (rev 1124)
+++ packages/unstable/dbus/debian/patches/40_dbus_launch_get_uuid.patch	2006-11-06 21:09:52 UTC (rev 1125)
@@ -0,0 +1,42 @@
+--- dbus-launch-x11.c	2006/10/01 20:05:39	1.3
++++ dbus-launch-x11.c	2006/10/26 17:34:49	1.4
+@@ -98,6 +98,10 @@
+   char *result;
+   char *p;
+ 
++  machine = get_machine_uuid ();
++  if (machine == NULL)
++    return NULL;
++
+   display = xstrdup (getenv ("DISPLAY"));
+   if (display == NULL)
+     {
+@@ -143,8 +147,6 @@
+         *p = '_';
+     }
+   
+-  machine = get_machine_uuid ();
+-
+   home = get_homedir ();
+   
+   result = malloc (strlen (home) + strlen (prefix) + strlen (machine) +
+@@ -237,6 +239,10 @@
+   if (init)
+     return TRUE;
+ 
++  machine = get_machine_uuid ();
++  if (machine == NULL)
++    return FALSE;
++
+   user = getpwuid (getuid ());
+   if (user == NULL)
+     {
+@@ -245,8 +251,6 @@
+     }
+   user_name = xstrdup(user->pw_name);
+ 
+-  machine = get_machine_uuid ();
+-
+   atom_name = malloc (strlen (machine) + strlen (user_name) + 2 +
+                       MAX (strlen (selection_prefix),
+                            MAX (strlen (address_prefix),