From 45090f34185cb71b87bd21d2a1d5a59ecc6f9f57 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 2 Nov 2022 07:06:46 +0900 Subject: [PATCH] core: fix memleak in GetUnitFileLinks method (cherry picked from commit a12ba535fa677e642c7ba19e81062ed6e9365ceb) Conflict:code context adaptation Reference:https://github.com/systemd/systemd-stable/commit/45090f34185cb71b87bd21d2a1d5a59ecc6f9f57 --- src/core/dbus-manager.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 92e717a00c..03ab35a941 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -2639,21 +2639,27 @@ static int method_get_unit_file_links(sd_bus_message *message, void *userdata, s (runtime ? UNIT_FILE_RUNTIME : 0); r = unit_file_disable(UNIT_FILE_SYSTEM, flags, NULL, p, &changes, &n_changes); - if (r < 0) - return log_error_errno(r, "Failed to get file links for %s: %m", name); + if (r < 0) { + log_error_errno(r, "Failed to get file links for %s: %m", name); + goto finish; + } for (i = 0; i < n_changes; i++) if (changes[i].type_or_errno == UNIT_FILE_UNLINK) { r = sd_bus_message_append(reply, "s", changes[i].path); if (r < 0) - return r; + goto finish; } r = sd_bus_message_close_container(reply); if (r < 0) - return r; + goto finish; - return sd_bus_send(NULL, reply, NULL); + r = sd_bus_send(NULL, reply, NULL); + +finish: + unit_file_changes_free(changes, n_changes); + return r; } static int method_get_job_waiting(sd_bus_message *message, void *userdata, sd_bus_error *error) { -- 2.33.0