From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 21 Jul 2011 12:06:21 +0000 (+0100)
Subject: update_desktop_file_entry: don't leak file_path on one particular OOM
X-Git-Tag: dbus-1.4.16~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e93d82862c4c9af9f2da9cba74b70ff98fd3b60;p=thirdparty%2Fdbus.git

update_desktop_file_entry: don't leak file_path on one particular OOM

Revenge of #33126: most, but not all, temporary variables were freed on
this code path.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39230
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
---

diff --git a/bus/activation.c b/bus/activation.c
index 3177d0237..c1f0e949f 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -457,8 +457,7 @@ update_desktop_file_entry (BusActivation       *activation,
            * the entries hash table */
           _dbus_hash_table_remove_string (entry->s_dir->entries,
                                           entry->filename);
-          bus_activation_entry_unref (entry);
-          return FALSE;
+          goto out;
         }
     }