[Commits] [SCM] claws branch, master, updated. 3.18.0-218-ge389d0d17

[wwp at claws-mail.org]

The branch, master has been updated
       via  e389d0d172652d1702a05a058165756253635237 (commit)
      from  b5ccfbc46483d8de5dafa480c2002f515bbaf427 (commit)

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


- Log -----------------------------------------------------------------
commit e389d0d172652d1702a05a058165756253635237
Author: wwp <subscript at free.fr>
Date:   Thu Sep 30 12:14:54 2021 +0200

    Fix CID 1491313: resource leak.

diff --git a/src/main.c b/src/main.c
index c0b38ca68..425ad02cd 100644
--- a/src/main.c
+++ b/src/main.c
@@ -379,12 +379,15 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
 {
 	gchar *message = g_strdup_printf(_("Configuration for %s found.\n"
 			 "Do you want to migrate this configuration?"), oldversion);
-	gchar *message2 = g_strdup_printf(_("\n\nYour Sylpheed filtering rules can be converted by a\n"
-			     "script available at %s."), TOOLS_URI);
 
-	if (!strcmp(oldversion, "Sylpheed"))
-		message = g_strconcat(message, message2, NULL);
-	g_free(message2);
+	if (!strcmp(oldversion, "Sylpheed")) {
+		gchar *message2 = g_strdup_printf(_("\n\nYour Sylpheed filtering rules can be converted by a\n"
+			     "script available at %s."), TOOLS_URI);
+		gchar *tmp = g_strconcat(message, message2, NULL);
+		g_free(message2);
+		g_free(message);
+        message = tmp;
+	}
 
 	gint r = 0;
 	GtkWidget *window = NULL;

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


hooks/post-receive
-- 
Claws Mail