changeset: 6751:1ef5734f6593
user:      Kevin McCarthy <[email protected]>
date:      Fri Aug 05 13:43:00 2016 -0700
link:      http://dev.mutt.org/hg/mutt/rev/1ef5734f6593

Fix memleak in mh_read_dir() when sequence parsing fails.

changeset: 6752:a39c8bdca361
user:      Kevin McCarthy <[email protected]>
date:      Fri Aug 05 13:43:04 2016 -0700
link:      http://dev.mutt.org/hg/mutt/rev/a39c8bdca361

Fix memory leak in mutt_choose_charset().

diffs (28 lines):

diff -r f6b5f533f9ce -r a39c8bdca361 mh.c
--- a/mh.c      Fri Aug 05 11:02:44 2016 -0700
+++ b/mh.c      Fri Aug 05 13:43:04 2016 -0700
@@ -1260,7 +1260,10 @@
   if (ctx->magic == MUTT_MH)
   {
     if (mh_read_sequences (&mhs, ctx->path) < 0)
+    {
+      maildir_free_maildir (&md);
       return -1;
+    }
     mh_update_maildir (md, &mhs);
     mhs_free_sequences (&mhs);
   }
diff -r f6b5f533f9ce -r a39c8bdca361 rfc2047.c
--- a/rfc2047.c Fri Aug 05 11:02:44 2016 -0700
+++ b/rfc2047.c Fri Aug 05 13:43:04 2016 -0700
@@ -153,7 +153,10 @@
 
     n = convert_string (u, ulen, fromcode, t, &s, &slen);
     if (n == (size_t)(-1))
+    {
+      FREE (&t);
       continue;
+    }
 
     if (!tocode || n < bestn)
     {

Reply via email to