From d8b489853cadaacb788751d37cdc2708c17e1fd6 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Sun, 5 Oct 2008 00:33:43 +0000 Subject: [PATCH] =?utf8?q?Bug=20554970=20=C3=A2=C2=80=C2=93=20segfault=20w?= =?utf8?q?hen=20update-desktop-database=20is=20not=20available?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-10-05 Pascal Terjan 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 --- gio/ChangeLog | 8 ++++++++ gio/gdesktopappinfo.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index e85ca28..192637a 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,11 @@ +2008-10-05 Pascal Terjan + + 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 * gdesktopappinfo.c (expand_macro): If possible, always pass FUSE diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 3ee0f34..847840f 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 { -- 2.7.4