projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move more things in the lib-mime
[apps/madmutt.git]
/
postpone.c
diff --git
a/postpone.c
b/postpone.c
index
cb51271
..
174d8e1
100644
(file)
--- a/
postpone.c
+++ b/
postpone.c
@@
-537,13
+537,13
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
err:
mx_close_message (&msg);
envelope_delete(&newhdr->env);
err:
mx_close_message (&msg);
envelope_delete(&newhdr->env);
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
mutt_error _("Decryption failed.");
return -1;
}
mutt_error _("Decryption failed.");
return -1;
}
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
newhdr->content = b;
mutt_clear_error ();
newhdr->content = b;
mutt_clear_error ();
@@
-563,7
+563,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
newhdr->security |= APPLICATION_SMIME;
/* destroy the signature */
-
mutt_free_body
(&newhdr->content->parts->next);
+
body_list_wipe
(&newhdr->content->parts->next);
newhdr->content = mutt_remove_multipart (newhdr->content);
}
newhdr->content = mutt_remove_multipart (newhdr->content);
}
@@
-642,7
+642,7
@@
int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
mutt_stamp_attachment (b);
mutt_stamp_attachment (b);
-
mutt_free_body
(&b->parts);
+
body_list_wipe
(&b->parts);
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
if (b->hdr)
b->hdr->content = NULL; /* avoid dangling pointer */
}
@@
-674,7
+674,7
@@
bail:
if (rv == -1) {
envelope_delete(&newhdr->env);
if (rv == -1) {
envelope_delete(&newhdr->env);
-
mutt_free_body
(&newhdr->content);
+
body_list_wipe
(&newhdr->content);
}
return rv;
}
return rv;