[Commits] [SCM] claws branch, gtk3, updated. 4.0.0-393-g39d152b96

[miras at claws-mail.org]

The branch, gtk3 has been updated
       via  39d152b96576509a26cfd2816b4abcdb2a67eb39 (commit)
       via  b678f516925b434be0d01f781b27bde2b82d82fc (commit)
      from  3e67cbb910aa492d06c6977e212dc60b86f67975 (commit)

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


- Log -----------------------------------------------------------------
commit 39d152b96576509a26cfd2816b4abcdb2a67eb39
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Jan 1 01:09:44 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 ea5b3cc51..2a2560cf0 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -6956,7 +6956,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);
@@ -6974,7 +6979,7 @@ static gchar *compose_get_header(Compose *compose)
 				g_string_append_printf(header, "%s %s\n",
 						compose_untranslated_header_name(headername_wcolon), headervalue);
 			}
-		}				
+		}
 		g_free(headername);
 		g_free(headername_wcolon);		
 	}

commit b678f516925b434be0d01f781b27bde2b82d82fc
Author: Michael Rasmussen <mir at datanom.net>
Date:   Sat Jan 1 01:08:35 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