gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

revert commit b0cdffc33f as its producing false positives

Browse source
This commit is contained in:
paul 2021-03-29 13:45:04 +01:00
parent fe623589e6
commit 2930d4ae17
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/folder.c
View file

@ -2864,9 +2864,8 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
MsgInfo *msginfo = data;
MimeInfo *mimeinfo = node->data;
if ((mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT ||
mimeinfo->disposition == DISPOSITIONTYPE_INLINE)
&& (!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT &&
(!mimeinfo->subtype || (strcmp(mimeinfo->subtype, "pgp-signature") &&
strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
strcmp(mimeinfo->subtype, "pkcs7-signature")))) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
@ -2879,6 +2878,14 @@ static void msginfo_set_mime_flags(GNode *node, gpointer data)
strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
strcmp(mimeinfo->subtype, "pkcs7-signature")))
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
} else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
mimeinfo->id == NULL &&
(strcmp(mimeinfo->subtype, "pgp-signature") &&
strcmp(mimeinfo->subtype, "x-pkcs7-signature") &&
strcmp(mimeinfo->subtype, "pkcs7-signature")) &&
(procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
}
/* don't descend below top level message for signed and encrypted info */