[Commits] [SCM] claws branch, master, updated. 3.18.0-322-g5ae9cfbe8

[miras at claws-mail.org]

The branch, master has been updated
       via  5ae9cfbe8572da548f163249669ac492242cff9c (commit)
       via  8c8be5e012df121076e18ffae9a84356dbdd3925 (commit)
      from  029cf7820a23f5d2b814339d5d15d28490d4bf24 (commit)

Summary of changes:
 src/compose.c         | 7 ++++++-
 src/quote_fmt_parse.y | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 5ae9cfbe8572da548f163249669ac492242cff9c
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Jan 1 01:19:01 2022 +0100

    Fix CID 1496033
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/compose.c b/src/compose.c
index 0fa1df979..52a94593b 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -6971,7 +6971,12 @@ static gchar *compose_get_header(Compose *compose)
 		g_free(tmp);
 		
 		entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
-		Xstrdup_a(headervalue, entry_str, return NULL);
+		Xstrdup_a(headervalue, entry_str, {
+                        g_free(headername);
+                        g_free(headername_wcolon);
+                        g_string_free(header, TRUE);
+                        return NULL;
+                });
 		subst_char(headervalue, '\r', ' ');
 		subst_char(headervalue, '\n', ' ');
 		g_strstrip(headervalue);

commit 8c8be5e012df121076e18ffae9a84356dbdd3925
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Jan 1 01:18:41 2022 +0100

    Fix CID 1496026
    
    Signed-off-by: Michael Rasmussen <mir at datanom.net>

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 60afe0989..0dce7b476 100644
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -596,7 +596,10 @@ static gchar *quote_fmt_complete_address(const gchar *addr)
 		return NULL;
 	}
 
-	Xstrdup_a(email_addr, split[0], return NULL);
+	Xstrdup_a(email_addr, split[0], {
+                g_strfreev(split);
+                return NULL;
+        });
 	extract_address(email_addr);
 	if (!*email_addr) {
 		g_strfreev(split);

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


hooks/post-receive
-- 
Claws Mail