summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gdm.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7cb72d29..b33a68a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-10 Brian Cameron <brian.cameron@sun.com>
+
+ * daemon/gdm.c: In debug message handle when display is NULL to
+ avoid core dump on Solaris.
+
2007-05-09 Brian Cameron <brian.cameron@sun.com>
* configure.ac: Fix check for Xserver to work on Solaris
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 19e382b4..d196d5aa 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -3586,6 +3586,7 @@ sup_handle_get_config (GdmConnection *conn,
static gboolean done_prefetch = FALSE;
retval = NULL;
+
parms = &msg[strlen (GDM_SUP_GET_CONFIG " ")];
splitstr = g_strsplit (parms, " ", 2);
@@ -3620,7 +3621,8 @@ sup_handle_get_config (GdmConnection *conn,
* value at all.
*/
- g_debug ("Handling GET_CONFIG: %s for display %s", splitstr[0], splitstr[1]);
+ g_debug ("Handling GET_CONFIG: %s for display %s", splitstr[0],
+ splitstr[1] ? splitstr[1] : "(null)");
res = gdm_daemon_config_to_string (splitstr[0], splitstr[1], &retval);