From 8c9fed14c10e8cf125a7760bdc2cbc58282de64c Mon Sep 17 00:00:00 2001 From: rbuj Date: Fri, 22 Oct 2021 10:30:10 +0200 Subject: file-data: fix memory leak --- src/file-data.c | 11 ++++++++--- src/fr-command-tar.c | 2 -- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/file-data.c b/src/file-data.c index 911a5e9..cc0832f 100644 --- a/src/file-data.c +++ b/src/file-data.c @@ -103,10 +103,15 @@ file_data_get_type (void) void file_data_update_content_type (FileData *fdata) { - if (fdata->dir) + if (fdata->dir) { fdata->content_type = MIME_TYPE_DIRECTORY; - else - fdata->content_type = get_static_string (g_content_type_guess (fdata->full_path, NULL, 0, NULL)); + } else { + char *content_type; + + content_type = g_content_type_guess (fdata->full_path, NULL, 0, NULL); + fdata->content_type = get_static_string (content_type); + g_free (content_type); + } } diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c index b61dffc..6f7943f 100644 --- a/src/fr-command-tar.c +++ b/src/fr-command-tar.c @@ -141,8 +141,6 @@ process_line (char *line, g_free (name); name = g_filename_from_utf8 (fdata->original_path, -1, NULL, NULL, NULL); if (name) { - if (fdata->free_original_path) - g_free (fdata->original_path); fdata->original_path = g_strdup (name); fdata->free_original_path = TRUE; } -- cgit v1.2.1