From: Pascal Terjan <pterjan@linuxfr.org>
Date: Sun, 5 Oct 2008 00:33:43 +0000 (+0000)
Subject: Bug 554970 – segfault when update-desktop-database is not available
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=d8b489853cadaacb788751d37cdc2708c17e1fd6;p=dana%2Fcg-glib.git

Bug 554970 – segfault when update-desktop-database is not available

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.


svn path=/trunk/; revision=7570
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index e85ca28a..192637a1 100644
--- 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 3ee0f344..847840ff 100644
--- 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
 	  {