talons

commit 638d5b064290083675d7a9408f742390e08eddf3
parent 3be5d29aacaeaa65ee72812e9bba2a52cca7e452
Author: Paul <paul@claws-mail.org>
Date:   Thu, 21 Jun 2018 10:54:11 +0100

fix bug, 'MDN mail-accountname leak'

always use whatever is in the To header for the From header when sending
Return Receipts

Diffstat:
M
src/messageview.c
 | 
15
++-------------

1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/messageview.c b/src/messageview.c
@@ -970,19 +970,8 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		goto FILE_ERROR;
 
 	/* From */
-	if (account->name && *account->name) {
-		notification_convert_header(&buf, account->name, strlen("From: "));
-		if (buf == NULL)
-			goto FILE_ERROR;
-		if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0) {
-			g_free(buf);
-			goto FILE_ERROR;
-		}
-		g_free(buf);
-		buf = NULL;
-	} else
-		if (fprintf(fp, "From: %s\n", account->address) < 0)
-			goto FILE_ERROR;
+	if (fprintf(fp, "From: %s\n", msginfo->to) < 0)
+		goto FILE_ERROR;
 
 	if (fprintf(fp, "To: %s\n", to) < 0)
 		goto FILE_ERROR;