Changeset 356:2d58361dd5a7

Timestamp:

1998-08-20 01:34:11 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

mutt-0-94

Message:

When you forward a message with $mime_forward set, or when
you attach a message with the "attach-message" command
from the "compose" menu, there is a memory leak. The real
reason for this leak is that multipart attachments are not
supported in the "compose" menu, so you need to go through
quite a few contortions in order to handle message/rfc822
attachments. Consequently, the patch below is just an
ugly hack. (From: Liviu Daia)

Files:

• attach.c (modified) (3 diffs)
• sendlib.c (modified) (1 diff)

attach.c

@@ -646 +646 @@
   STATE s;
   unsigned int saved_encoding = 0;
+  BODY *saved_parts = NULL;
+  HEADER *saved_hdr = NULL;
 
   memset (&s, 0, sizeof (s));
@@ -684 +686 @@
     m->offset = 0;
     if (mutt_is_message_type(m->type, m->subtype))
+    {
+      saved_parts = m->parts;
+      saved_hdr = m->hdr;
       m->parts = mutt_parse_messageRFC822 (s.fpin, m);
+    }
   }
   else
@@ -696 +702 @@
     m->length = 0;
     m->encoding = saved_encoding;
-    if (m->parts)
-      mutt_free_body (&m->parts);
+    if (saved_parts)
+    {
+      mutt_free_header (&m->hdr);
+      m->parts = saved_parts;
+      m->hdr = saved_hdr;
+    }
     fclose (s.fpin);
   }

sendlib.c

@@ -944 +944 @@
   rewind(fp);
 
-  body->hdr         = mutt_new_header();
+  body->hdr = mutt_new_header();
   body->hdr->offset = 0;
-  body->hdr->env    = mutt_read_rfc822_header(fp, body->hdr);
+  body->hdr->env = mutt_read_rfc822_header(fp, body->hdr);
   mutt_update_encoding (body);
+  body->parts = body->hdr->content;
 
   fclose(fp);