Bug 554970 â\80\93 segfault when update-desktop-database is not available

2008-10-05  Pascal Terjan  <pterjan@linuxfr.org>

	Bug 554970 â\80\93 segfault when update-desktop-database is not available
	on the system

	* gdesktopappinfo.c (run_update_command): Have the error set before
	using it.

svn path=/trunk/; revision=7570

diff --git a/gio/ChangeLog b/gio/ChangeLog
index e85ca28..192637a 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-05  Pascal Terjan  <pterjan@linuxfr.org>
+
+       Bug 554970 – segfault when update-desktop-database is not available
+       on the system
+
+       * gdesktopappinfo.c (run_update_command): Have the error set before 
+       using it.
+
 2008-10-01  David Zeuthen  <davidz@redhat.com>
 
        * gdesktopappinfo.c (expand_macro): If possible, always pass FUSE

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 3ee0f34..847840f 100644 (file)
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -1400,7 +1400,7 @@ run_update_command (char *command,
                           G_SPAWN_DO_NOT_REAP_CHILD,
                           NULL, NULL, /* No setup function */
                           &pid,
-                          NULL)) 
+                          &error)) 
          g_child_watch_add (pid, update_program_done, NULL);
        else
          {