X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=c311ba226ce0004ae1ab06b5b9b63a53702a43a0;hp=3323af6570ab35c9a98f94088c881035af65dd33;hb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1;hpb=cac1491258e026b8c8459b2ad408a6bf2e8a03bc diff --git a/attach.c b/attach.c index 3323af6..c311ba2 100644 --- a/attach.c +++ b/attach.c @@ -325,6 +325,8 @@ void mutt_check_lookup_list (BODY * b, char *type, int len) BODY tmp; int n; + p_clear(&tmp, 1); + if ((n = mutt_lookup_mime_type (&tmp, b->filename)) != TYPEOTHER) { snprintf (type, len, "%s/%s", n == TYPEAUDIO ? "audio" : @@ -397,7 +399,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr, int unlink_tempfile = 0; is_message = mutt_is_message_type (a->type, a->subtype); - if (WithCrypto && is_message && a->hdr && (a->hdr->security & ENCRYPT) && + if (is_message && a->hdr && (a->hdr->security & ENCRYPT) && !crypt_valid_passphrase (a->hdr->security)) return (rc); use_mailcap = (flag == M_MAILCAP ||