[gnome-settings-daemon] main: Fix possible double-free outside gnome-session



commit 4143b3a0529d495adce8453ef21b84eee25b07fd
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Sep 1 13:57:13 2011 +0100

    main: Fix possible double-free outside gnome-session
    
    If gnome-session isn't available, or the Setenv call fails
    we could be crashing trying to unreference a NULL variant.

 gnome-settings-daemon/main.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c
index 83e7206..ef993e9 100644
--- a/gnome-settings-daemon/main.c
+++ b/gnome-settings-daemon/main.c
@@ -174,8 +174,11 @@ session_env_done (GObject             *source_object,
         GError *error = NULL;
 
         result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
-        if (error != NULL)
+        if (result != NULL) {
+                g_debug ("Failed to set the environment: %s", error->message);
                 g_error_free (error);
+                return;
+        }
 
         g_variant_unref (result);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]