From a8e3e1826fb4d0d4909fbd5a549513bc75de6e9f Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Thu, 14 Jul 2016 17:26:02 -0700 Subject: [PATCH 1/2] FlatpakDir: use correct function to free FlatpakContext refs These are not keyfiles. This fixes a crash when launching applications through gnome-sofware. --- common/flatpak-dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 4ba08ac4..9ac7b458 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -122,8 +122,8 @@ flatpak_deploy_finalize (GObject *object) g_clear_object (&self->dir); g_clear_pointer (&self->metadata, g_key_file_unref); - g_clear_pointer (&self->system_overrides, g_key_file_unref); - g_clear_pointer (&self->user_overrides, g_key_file_unref); + g_clear_pointer (&self->system_overrides, flatpak_context_free); + g_clear_pointer (&self->user_overrides, flatpak_context_free); G_OBJECT_CLASS (flatpak_deploy_parent_class)->finalize (object); } From 692125c115394d74d68b642a754aaa25de23c959 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Thu, 14 Jul 2016 17:27:11 -0700 Subject: [PATCH 2/2] run: plug a few memory leaks --- common/flatpak-run.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index f5d1a56d..97abcd4a 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -1403,7 +1403,7 @@ flatpak_run_add_x11_args (GPtrArray *argv_array, char ***envp_p, gboolean allowed) { - char *x11_socket = NULL; + g_autofree char *x11_socket = NULL; const char *display; /* Always cover /tmp/.X11-unix, that way we never see the host one in case @@ -1503,7 +1503,7 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array, GArray *fd_array, char ***envp_p) { - char *pulseaudio_socket = g_build_filename (g_get_user_runtime_dir (), "pulse/native", NULL); + g_autofree char *pulseaudio_socket = g_build_filename (g_get_user_runtime_dir (), "pulse/native", NULL); *envp_p = g_environ_unsetenv (*envp_p, "PULSE_SERVER"); if (g_file_test (pulseaudio_socket, G_FILE_TEST_EXISTS)) @@ -1537,8 +1537,8 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array, static void flatpak_run_add_journal_args (GPtrArray *argv_array) { - const char *journal_socket_socket = g_strdup ("/run/systemd/journal/socket"); - const char *journal_stdout_socket = g_strdup ("/run/systemd/journal/stdout"); + g_autofree char *journal_socket_socket = g_strdup ("/run/systemd/journal/socket"); + g_autofree char *journal_stdout_socket = g_strdup ("/run/systemd/journal/stdout"); if (g_file_test (journal_socket_socket, G_FILE_TEST_EXISTS)) {