From 9a3145b9f3cb0d7d570230aaa6193f87e3bea604 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 8 Aug 2006 23:29:03 +0000 Subject: These are all patches from Kjartan Maraas with cleanups of bugs found from Coverity reports: * dbus/dbus-sysdeps-util.c (_dbus_write_pid_file): close the file on error to avoid a leak * bus/expirelist.c (bus_expire_list_test): Check for NULL on dbus_new0 * bus/activation.c (update_directory): remove dead code * bus/config-parser.c (merge_service_context_hash, start_selinux_child): Fix some leaks * bus/bus.c (process_config_every_time): Fixed a leak * bus/desktop-file.c (parse_key_value): Fixed leak * bus/selinux.c (bus_selinux_id_table_insert): Fixed leak --- bus/activation.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'bus/activation.c') diff --git a/bus/activation.c b/bus/activation.c index 40221938..3d169017 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -633,8 +633,6 @@ update_directory (BusActivation *activation, if (iter != NULL) _dbus_directory_close (iter); - if (desktop_file) - bus_desktop_file_free (desktop_file); _dbus_string_free (&filename); _dbus_string_free (&full_path); -- cgit