gnome-session r4726 - in trunk: . compat

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Jun 10 13:04:17 2008
New Revision: 4726
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4726&view=rev

Log:
2008-06-10  Kjartan Maraas  <kmaraas gnome org>

	* compat/gnome-keyring-daemon-wrapper.c: (keyring_daemon_start),
	(main): Fix some invalid reads and a leak reported by valgrind. Closes
	bug #537577.

Modified:
   trunk/ChangeLog
   trunk/compat/gnome-keyring-daemon-wrapper.c

Modified: trunk/compat/gnome-keyring-daemon-wrapper.c
==============================================================================
--- trunk/compat/gnome-keyring-daemon-wrapper.c	(original)
+++ trunk/compat/gnome-keyring-daemon-wrapper.c	Tue Jun 10 13:04:17 2008
@@ -131,7 +131,7 @@
                                       G_TYPE_INVALID))
                 {
                   g_warning ("Could not set %s: %s", env[0], err->message);
-                  g_error_free (err);
+                  g_clear_error (&err);
                 }
               g_strfreev (env);
 
@@ -150,7 +150,7 @@
                                           G_TYPE_INVALID))
                     {
                       g_warning ("Could not set %s: %s", env[0], err->message);
-                      g_error_free (err);
+                      g_clear_error (&err);
                     }
                   g_strfreev (env);
                 }
@@ -193,6 +193,7 @@
     {
       g_printerr ("Could not parse arguments: %s\n", err->message);
       g_error_free (err);
+      g_option_context_free (goption_context);
       return 1;
     }
 
@@ -212,6 +213,7 @@
   keyring_daemon_start (gsm);
   gtk_main ();
   keyring_daemon_stop ();
+  g_option_context_free (goption_context);
 
   return 0;
 }