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.
This solves a crash reported by some users if
--exit-with-session was used without --autolaunch=<machine-id>
+2006-10-26 Thiago Macieira <thiago@kde.org>
+
+ * tools/dbus-launch-x11.c (get_session_file, init_x_atoms):
+ 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.
+ This solves a crash reported by some users if
+ --exit-with-session was used without --autolaunch=<machine-id>
+
2006-10-26 John (J5) Palmieri <johnp@redhat.com>
* tools/dbus-launch.c (main): run the dbus-daemon in the builddir
char *result;
char *p;
+ machine = get_machine_uuid ();
+ if (machine == NULL)
+ return NULL;
+
display = xstrdup (getenv ("DISPLAY"));
if (display == NULL)
{
*p = '_';
}
- machine = get_machine_uuid ();
-
home = get_homedir ();
result = malloc (strlen (home) + strlen (prefix) + strlen (machine) +
if (init)
return TRUE;
+ machine = get_machine_uuid ();
+ if (machine == NULL)
+ return FALSE;
+
user = getpwuid (getuid ());
if (user == NULL)
{
}
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),