From 2b4b01b00ac9d0a5940316fa24cb7cd12fc3e757 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 28 Mar 2023 13:38:18 +0200 Subject: [PATCH] portabled-image-bus: use CLEANUP_ARRAY --- src/portable/portabled-image-bus.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index 6c4cb6ec9de..1aec2783f18 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -316,6 +316,8 @@ int bus_image_common_attach( assert(message); assert(name_or_path || image); + CLEANUP_ARRAY(changes, n_changes, portable_changes_free); + if (!m) { assert(image); m = image->userdata; @@ -390,13 +392,9 @@ int bus_image_common_attach( &n_changes, error); if (r < 0) - goto finish; - - r = reply_portable_changes(message, changes, n_changes); + return r; -finish: - portable_changes_free(changes, n_changes); - return r; + return reply_portable_changes(message, changes, n_changes); } static int bus_image_method_attach(sd_bus_message *message, void *userdata, sd_bus_error *error) { -- 2.47.3