update_desktop_file_entry: don't leak file_path on one particular OOM
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 21 Jul 2011 12:06:21 +0000 (13:06 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:33:38 +0000 (11:33 +0100)
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>
bus/activation.c

index 3177d02..c1f0e94 100644 (file)
@@ -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;
         }
     }