[systemd-devel] [PATCH] Fix a fatal dbus abort in bus_manager_message_handler()

[Eelco Dolstra]

If ListUnitFiles fails, or an OOM occurs, then dbus_message_unref()
will be called twice on "reply", causing systemd to crash.  So remove
the calls to dbus_message_unref(); these are unnecessary because of
the cleanup attribute on "reply".
---
 src/core/dbus-manager.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 2010241..0418e35 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -495,7 +495,6 @@ static DBusMessage *message_from_file_changes(
         return reply;
 
 oom:
-        dbus_message_unref(reply);
         return NULL;
 }
 
@@ -1436,7 +1435,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                 r = unit_file_get_list(m->running_as == SYSTEMD_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, NULL, h);
                 if (r < 0) {
                         unit_file_list_free(h);
-                        dbus_message_unref(reply);
                         return bus_send_error_reply(connection, message, NULL, r);
                 }
 
-- 
1.7.12.2