From d1bc22fbf8678b4f4d886c9097c2ffec3532b9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= Date: Sat, 5 Oct 2024 22:29:15 -0400 Subject: [PATCH] Fix some memory leaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit g_build_filename() always transfer full Add auto cleanup for Settings implementation Signed-off-by: Hubert Figuière --- src/settings.c | 6 ++++-- src/xdp-app-info-flatpak.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/settings.c b/src/settings.c index 1b9ef9929..d90ca5ac3 100644 --- a/src/settings.c +++ b/src/settings.c @@ -56,6 +56,8 @@ G_DEFINE_TYPE_WITH_CODE (Settings, settings, XDP_DBUS_TYPE_SETTINGS_SKELETON, G_IMPLEMENT_INTERFACE (XDP_DBUS_TYPE_SETTINGS, settings_iface_init)); +G_DEFINE_AUTOPTR_CLEANUP_FUNC (Settings, g_object_unref) + static gboolean settings_handle_read_all (XdpDbusSettings *object, GDBusMethodInvocation *invocation, @@ -217,7 +219,7 @@ GDBusInterfaceSkeleton * settings_create (GDBusConnection *connection, GPtrArray *implementations) { - Settings *settings; + g_autoptr(Settings) settings = NULL; g_autoptr(GError) error = NULL; int i; int n_impls_tmp; @@ -255,5 +257,5 @@ settings_create (GDBusConnection *connection, return NULL; } - return G_DBUS_INTERFACE_SKELETON (settings); + return G_DBUS_INTERFACE_SKELETON (g_steal_pointer (&settings)); } diff --git a/src/xdp-app-info-flatpak.c b/src/xdp-app-info-flatpak.c index 933beec95..0d7ba5149 100644 --- a/src/xdp-app-info-flatpak.c +++ b/src/xdp-app-info-flatpak.c @@ -500,7 +500,7 @@ load_bwrap_info (const char *instance, g_autoptr(JsonNode) root = NULL; g_autofree char *data = NULL; gsize len; - char *path; + g_autofree char *path = NULL; g_return_val_if_fail (instance != NULL, 0);