Control: tags 980326 + patch Control: tags 980326 + pending Hi Antonio,
I've prepared an NMU for mutt (versioned as 2.0.2-1.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer (or shorter). Actually IMHO it would be more sensible to rebase to the current upstream version and cherry-pick the additional commits already queued for stable. Regards, Salvatore
diff -Nru mutt-2.0.2/debian/changelog mutt-2.0.2/debian/changelog --- mutt-2.0.2/debian/changelog 2020-11-22 11:59:19.000000000 +0100 +++ mutt-2.0.2/debian/changelog 2021-01-19 08:53:54.000000000 +0100 @@ -1,3 +1,11 @@ +mutt (2.0.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix memory leak parsing group addresses without a display name + (Closes: #980326) + + -- Salvatore Bonaccorso <[email protected]> Tue, 19 Jan 2021 08:53:54 +0100 + mutt (2.0.2-1) unstable; urgency=medium * New upstream release. diff -Nru mutt-2.0.2/debian/patches/series mutt-2.0.2/debian/patches/series --- mutt-2.0.2/debian/patches/series 2020-11-22 11:59:19.000000000 +0100 +++ mutt-2.0.2/debian/patches/series 2021-01-19 08:53:54.000000000 +0100 @@ -11,3 +11,4 @@ misc/gpg.rc-paths.patch misc/smime.rc.patch upstream/528233-readonly-open.patch +upstream/Fix-memory-leak-parsing-group-addresses-without-a-di.patch diff -Nru mutt-2.0.2/debian/patches/upstream/Fix-memory-leak-parsing-group-addresses-without-a-di.patch mutt-2.0.2/debian/patches/upstream/Fix-memory-leak-parsing-group-addresses-without-a-di.patch --- mutt-2.0.2/debian/patches/upstream/Fix-memory-leak-parsing-group-addresses-without-a-di.patch 1970-01-01 01:00:00.000000000 +0100 +++ mutt-2.0.2/debian/patches/upstream/Fix-memory-leak-parsing-group-addresses-without-a-di.patch 2021-01-19 08:53:54.000000000 +0100 @@ -0,0 +1,40 @@ +From: Kevin McCarthy <[email protected]> +Date: Sun, 17 Jan 2021 10:40:37 -0800 +Subject: Fix memory leak parsing group addresses without a display name. +Origin: https://gitlab.com/muttmua/mutt/-/commit/4a2becbdb4422aaffe3ce314991b9d670b7adf17 +Bug: https://gitlab.com/muttmua/mutt/-/issues/323 +Bug-Debian: https://bugs.debian.org/980326 + +When there was a group address terminator with no previous +addresses (including the group display-name), an address would be +allocated but not attached to the address list. + +Change this to only allocate when last exists. + +It would be more correct to not allocate at all unless we are inside a +group list, but I will address that in a separate commit to master. +--- + rfc822.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/rfc822.c b/rfc822.c +index 7ff4eaa354cc..ced619f2e9a5 100644 +--- a/rfc822.c ++++ b/rfc822.c +@@ -587,11 +587,10 @@ ADDRESS *rfc822_parse_adrlist (ADDRESS *top, const char *s) + #endif + + /* add group terminator */ +- cur = rfc822_new_address (); + if (last) + { +- last->next = cur; +- last = cur; ++ last->next = rfc822_new_address (); ++ last = last->next; + } + + phraselen = 0; +-- +2.30.0 +
