GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed attachment detection with non-MIME message (thanks to Peter Libic).

Browse Source
This commit is contained in:
Vincent Richard 2006-12-14 21:38:04 +00:00
parent f95b91c547
commit 3263ad2760
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/attachmentHelper.cpp
View File

@ -72,6 +72,12 @@ const bool attachmentHelper::isBodyPartAnAttachment(ref <const bodyPart> part)
} }
catch (exceptions::no_such_field&) catch (exceptions::no_such_field&)
{ {
// If this is the root part and no Content-Type field is present,
// then this may not be a MIME message, so do not assume it is
// an attachment
if (part->getParentPart() == NULL)
return false;
// No "Content-type" field: assume "application/octet-stream". // No "Content-type" field: assume "application/octet-stream".
type = mediaType(mediaTypes::APPLICATION, type = mediaType(mediaTypes::APPLICATION,
mediaTypes::APPLICATION_OCTET_STREAM); mediaTypes::APPLICATION_OCTET_STREAM);
@ -157,7 +163,7 @@ const std::vector <ref <const attachment> >
std::vector <ref <const attachment> > partAtts = std::vector <ref <const attachment> > partAtts =
findAttachmentsInBodyPart(bdy->getPartAt(i)); findAttachmentsInBodyPart(bdy->getPartAt(i));
std::copy(partAtts.begin(), partAtts.end(), std::back_inserter(atts)); std::copy(partAtts.begin(), partAtts.end(), std::back_inserter(atts));
} }
} }