[Commits] [SCM] claws branch, master, updated. 3.15.0-57-g6c3b59e

[ticho at claws-mail.org]

The branch, master has been updated
       via  6c3b59e6ecc2ac6ffa6d4bf201f630b58641b2cf (commit)
      from  70ea2d849d40ca19a334f273322a5fceae634e60 (commit)

Summary of changes:
 src/gtk/w32_filesel.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 6c3b59e6ecc2ac6ffa6d4bf201f630b58641b2cf
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sun May 21 22:00:03 2017 +0200

    Some forgotten cleanups for previous commit, 70ea2d849.

diff --git a/src/gtk/w32_filesel.c b/src/gtk/w32_filesel.c
index b34f371..f0db011 100644
--- a/src/gtk/w32_filesel.c
+++ b/src/gtk/w32_filesel.c
@@ -258,7 +258,6 @@ GList *filesel_select_multiple_files_open_with_filter(const gchar *title,
 	 * "directory0file0file0...0file00" for multiple files selected,
 	 * "fullfilepath0" for single file. */
 	str = g_utf16_to_utf8(o.lpstrFile, -1, &items_read, NULL, &error);
-	g_free(o.lpstrFile);
 
 	if (error != NULL) {
 		alertpanel_error(_("Could not convert file path back to UTF-8:\n\n%s"),
@@ -293,6 +292,7 @@ GList *filesel_select_multiple_files_open_with_filter(const gchar *title,
 					error->message);
 			debug_print("returned file path conversion to UTF-8 failed\n");
 			g_error_free(error);
+			g_free(o.lpstrFile);
 			return NULL;
 		}
 
@@ -301,15 +301,13 @@ GList *filesel_select_multiple_files_open_with_filter(const gchar *title,
 			file_list = g_list_append(file_list,
 					g_strconcat(dir, G_DIR_SEPARATOR_S, str, NULL));
 		}
+		g_free(str);
 
 		n += items_read + 1;
 		f = &o.lpstrFile[n];
 	}
 
-
-
-
-
+	g_free(o.lpstrFile);
 	return file_list;
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail