diff options
| author | Phaedrus Leeds <mwleeds@protonmail.com> | 2021-05-02 21:53:02 -0500 |
|---|---|---|
| committer | Alexander Larsson <alexander.larsson@gmail.com> | 2021-05-04 10:23:13 +0200 |
| commit | 404d7c6941baf63d1b3ccbe9ee9d34f3ff12f35f (patch) | |
| tree | 098f7ee06a85e40aa0261d378137af27774e2976 | |
| parent | 4562627b0424ad381aa16975f77552b3e1afbaf3 (diff) | |
| download | flatpak-404d7c6941baf63d1b3ccbe9ee9d34f3ff12f35f.tar.gz | |
Fix several memory leaks
| -rw-r--r-- | app/flatpak-builtins-document-export.c | 6 | ||||
| -rw-r--r-- | common/flatpak-dir.c | 7 | ||||
| -rw-r--r-- | common/flatpak-utils.c | 1 | ||||
| -rw-r--r-- | portal/flatpak-portal.c | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/app/flatpak-builtins-document-export.c b/app/flatpak-builtins-document-export.c index 15f1ad12..e701a826 100644 --- a/app/flatpak-builtins-document-export.c +++ b/app/flatpak-builtins-document-export.c @@ -90,8 +90,8 @@ flatpak_builtin_document_export (int argc, char **argv, g_autofree char *dirname = NULL; g_autofree char *doc_path = NULL; XdpDbusDocuments *documents; - int fd, fd_id; - int i; + glnx_autofd int fd = -1; + int i, fd_id; GUnixFDList *fd_list = NULL; const char *doc_id; struct stat stbuf; @@ -173,7 +173,7 @@ flatpak_builtin_document_export (int argc, char **argv, fd_list = g_unix_fd_list_new (); fd_id = g_unix_fd_list_append (fd_list, fd, error); - close (fd); + glnx_close_fd (&fd); if (opt_noexist) { diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index bfe14546..ec52291c 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -13670,14 +13670,15 @@ parse_ref_file (GKeyFile *keyfile, collection_id = g_key_file_get_string (keyfile, FLATPAK_REF_GROUP, FLATPAK_REF_DEPLOY_COLLECTION_ID_KEY, NULL); - if (collection_id == NULL || *collection_id == '\0') + if (collection_id != NULL && *collection_id == '\0') + g_clear_pointer (&collection_id, g_free); + if (collection_id == NULL) { collection_id = g_key_file_get_string (keyfile, FLATPAK_REF_GROUP, FLATPAK_REF_COLLECTION_ID_KEY, NULL); } - if (collection_id != NULL && *collection_id == '\0') - collection_id = NULL; + g_clear_pointer (&collection_id, g_free); if (collection_id != NULL && gpg_data == NULL) return flatpak_fail_error (error, FLATPAK_ERROR_INVALID_DATA, _("Collection ID requires GPG key to be provided")); diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c index ce2fdeb8..84011517 100644 --- a/common/flatpak-utils.c +++ b/common/flatpak-utils.c @@ -2288,6 +2288,7 @@ flatpak_parse_repofile (const char *remote_name, decoded = g_base64_decode (gpg_key, &decoded_len); if (decoded_len < 10) /* Check some minimal size so we don't get crap */ { + g_free (decoded); flatpak_fail_error (error, FLATPAK_ERROR_INVALID_DATA, _("Invalid gpg key")); return NULL; } diff --git a/portal/flatpak-portal.c b/portal/flatpak-portal.c index a8940894..b35bbe8b 100644 --- a/portal/flatpak-portal.c +++ b/portal/flatpak-portal.c @@ -761,7 +761,7 @@ handle_spawn (PortalFlatpak *object, const gint *fds = NULL; gint fds_len = 0; g_autofree FdMapEntry *fd_map = NULL; - gchar **env; + g_auto(GStrv) env = NULL; gint32 max_fd; GKeyFile *app_info; g_autoptr(GPtrArray) flatpak_argv = g_ptr_array_new_with_free_func (g_free); |