From 885708f75f493b85fb67114d112e950b6bfac652 Mon Sep 17 00:00:00 2001
From: William Jon McCann <jmccann@redhat.com>
Date: Tue, 12 Feb 2008 15:32:15 -0500
Subject: guard against writing null string to keyfile

Also make criticals fatal when starting with --debug.
---
 src/ck-seat.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/ck-seat.c')

diff --git a/src/ck-seat.c b/src/ck-seat.c
index 91ef733..bc39010 100644
--- a/src/ck-seat.c
+++ b/src/ck-seat.c
@@ -49,6 +49,7 @@
 #define CK_DBUS_PATH "/org/freedesktop/ConsoleKit"
 #define CK_DBUS_NAME "org.freedesktop.ConsoleKit"
 
+#define NONULL_STRING(x) ((x) != NULL ? (x) : "")
 
 struct CkSeatPrivate
 {
@@ -1201,7 +1202,10 @@ ck_seat_dump (CkSeat   *seat,
                                    error->message);
                         g_error_free (error);
                 } else {
-                        g_key_file_set_string (key_file, group_name, "active_session", session_id);
+                        g_key_file_set_string (key_file,
+                                               group_name,
+                                               "active_session",
+                                               NONULL_STRING (session_id));
                         g_free (session_id);
                 }
         }
-- 
cgit