msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Catch parse OOM

Browse Source
pull/199/head
M66B 3 years ago
parent cebc18794f
commit 9357cceb86
1 changed files with 109 additions and 104 deletions
Show Stats Download Patch File Download Diff File

213
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -2369,125 +2369,131 @@ public class MessageHelper {
try { try {
ensureStructure(); ensureStructure();
MimePart part = imessage; try {
MimePart part = imessage;
if (part.isMimeType("multipart/mixed")) {
Object content = part.getContent();
if (content instanceof Multipart) {
Multipart mp = (Multipart) content;
for (int i = 0; i < mp.getCount(); i++) {
BodyPart bp = mp.getBodyPart(i);
if (bp.isMimeType("multipart/signed") || bp.isMimeType("multipart/encrypted")) {
part = (MimePart) bp;
break;
}
}
} else {
String msg = "Multipart=" + (content == null ? null : content.getClass().getName());
Log.e(msg);
throw new MessagingException(msg);
}
}
if (part.isMimeType("multipart/signed")) { if (part.isMimeType("multipart/mixed")) {
ContentType ct = new ContentType(part.getContentType());
String protocol = ct.getParameter("protocol");
if ("application/pgp-signature".equals(protocol) ||
"application/pkcs7-signature".equals(protocol) ||
"application/x-pkcs7-signature".equals(protocol)) {
Object content = part.getContent(); Object content = part.getContent();
if (content instanceof Multipart) { if (content instanceof Multipart) {
Multipart multipart = (Multipart) content; Multipart mp = (Multipart) content;
if (multipart.getCount() == 2) { for (int i = 0; i < mp.getCount(); i++) {
getMessageParts(multipart.getBodyPart(0), parts, null); BodyPart bp = mp.getBodyPart(i);
getMessageParts(multipart.getBodyPart(1), parts, if (bp.isMimeType("multipart/signed") || bp.isMimeType("multipart/encrypted")) {
"application/pgp-signature".equals(protocol) part = (MimePart) bp;
? EntityAttachment.PGP_SIGNATURE break;
: EntityAttachment.SMIME_SIGNATURE); }
AttachmentPart apart = new AttachmentPart();
apart.disposition = Part.INLINE;
apart.filename = "content.asc";
apart.encrypt = "application/pgp-signature".equals(protocol)
? EntityAttachment.PGP_CONTENT
: EntityAttachment.SMIME_CONTENT;
apart.part = part;
apart.attachment = new EntityAttachment();
apart.attachment.disposition = apart.disposition;
apart.attachment.name = apart.filename;
apart.attachment.type = "text/plain";
apart.attachment.size = getSize();
apart.attachment.encryption = apart.encrypt;
parts.attachments.add(apart);
return parts;
} else {
StringBuilder sb = new StringBuilder();
sb.append(ct);
for (int i = 0; i < multipart.getCount(); i++)
sb.append(' ').append(i).append('=').append(multipart.getBodyPart(i).getContentType());
Log.e(sb.toString());
} }
} else { } else {
String msg = "Multipart=" + (content == null ? null : content.getClass().getName()); String msg = "Multipart=" + (content == null ? null : content.getClass().getName());
Log.e(msg); Log.e(msg);
throw new MessagingException(msg); throw new MessagingException(msg);
} }
} else }
Log.e(ct.toString());
} else if (part.isMimeType("multipart/encrypted")) { if (part.isMimeType("multipart/signed")) {
ContentType ct = new ContentType(part.getContentType()); ContentType ct = new ContentType(part.getContentType());
String protocol = ct.getParameter("protocol"); String protocol = ct.getParameter("protocol");
if ("application/pgp-encrypted".equals(protocol) || protocol == null) { if ("application/pgp-signature".equals(protocol) ||
Object content = part.getContent(); "application/pkcs7-signature".equals(protocol) ||
if (content instanceof Multipart) { "application/x-pkcs7-signature".equals(protocol)) {
Multipart multipart = (Multipart) content; Object content = part.getContent();
if (multipart.getCount() == 2) { if (content instanceof Multipart) {
// Ignore header Multipart multipart = (Multipart) content;
getMessageParts(multipart.getBodyPart(1), parts, EntityAttachment.PGP_MESSAGE); if (multipart.getCount() == 2) {
return parts; getMessageParts(multipart.getBodyPart(0), parts, null);
getMessageParts(multipart.getBodyPart(1), parts,
"application/pgp-signature".equals(protocol)
? EntityAttachment.PGP_SIGNATURE
: EntityAttachment.SMIME_SIGNATURE);
AttachmentPart apart = new AttachmentPart();
apart.disposition = Part.INLINE;
apart.filename = "content.asc";
apart.encrypt = "application/pgp-signature".equals(protocol)
? EntityAttachment.PGP_CONTENT
: EntityAttachment.SMIME_CONTENT;
apart.part = part;
apart.attachment = new EntityAttachment();
apart.attachment.disposition = apart.disposition;
apart.attachment.name = apart.filename;
apart.attachment.type = "text/plain";
apart.attachment.size = getSize();
apart.attachment.encryption = apart.encrypt;
parts.attachments.add(apart);
return parts;
} else {
StringBuilder sb = new StringBuilder();
sb.append(ct);
for (int i = 0; i < multipart.getCount(); i++)
sb.append(' ').append(i).append('=').append(multipart.getBodyPart(i).getContentType());
Log.e(sb.toString());
}
} else {
String msg = "Multipart=" + (content == null ? null : content.getClass().getName());
Log.e(msg);
throw new MessagingException(msg);
}
} else
Log.e(ct.toString());
} else if (part.isMimeType("multipart/encrypted")) {
ContentType ct = new ContentType(part.getContentType());
String protocol = ct.getParameter("protocol");
if ("application/pgp-encrypted".equals(protocol) || protocol == null) {
Object content = part.getContent();
if (content instanceof Multipart) {
Multipart multipart = (Multipart) content;
if (multipart.getCount() == 2) {
// Ignore header
getMessageParts(multipart.getBodyPart(1), parts, EntityAttachment.PGP_MESSAGE);
return parts;
} else {
StringBuilder sb = new StringBuilder();
sb.append(ct);
for (int i = 0; i < multipart.getCount(); i++)
sb.append(' ').append(i).append('=').append(multipart.getBodyPart(i).getContentType());
Log.e(sb.toString());
}
} else { } else {
StringBuilder sb = new StringBuilder(); String msg = "Multipart=" + (content == null ? null : content.getClass().getName());
sb.append(ct); Log.e(msg);
for (int i = 0; i < multipart.getCount(); i++) throw new MessagingException(msg);
sb.append(' ').append(i).append('=').append(multipart.getBodyPart(i).getContentType());
Log.e(sb.toString());
} }
} else
Log.e(ct.toString());
} else if (part.isMimeType("application/pkcs7-mime") ||
part.isMimeType("application/x-pkcs7-mime")) {
ContentType ct = new ContentType(part.getContentType());
String smimeType = ct.getParameter("smime-type");
if ("enveloped-data".equalsIgnoreCase(smimeType)) {
getMessageParts(part, parts, EntityAttachment.SMIME_MESSAGE);
return parts;
} else if ("signed-data".equalsIgnoreCase(smimeType)) {
getMessageParts(part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts;
} else { } else {
String msg = "Multipart=" + (content == null ? null : content.getClass().getName()); if (TextUtils.isEmpty(smimeType)) {
Log.e(msg); String name = ct.getParameter("name");
throw new MessagingException(msg); if ("smime.p7m".equalsIgnoreCase(name)) {
} getMessageParts(part, parts, EntityAttachment.SMIME_MESSAGE);
} else return parts;
Log.e(ct.toString()); } else if ("smime.p7s".equalsIgnoreCase(name)) {
} else if (part.isMimeType("application/pkcs7-mime") || getMessageParts(part, parts, EntityAttachment.SMIME_SIGNED_DATA);
part.isMimeType("application/x-pkcs7-mime")) { return parts;
ContentType ct = new ContentType(part.getContentType()); }
String smimeType = ct.getParameter("smime-type");
if ("enveloped-data".equalsIgnoreCase(smimeType)) {
getMessageParts(part, parts, EntityAttachment.SMIME_MESSAGE);
return parts;
} else if ("signed-data".equalsIgnoreCase(smimeType)) {
getMessageParts(part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts;
} else {
if (TextUtils.isEmpty(smimeType)) {
String name = ct.getParameter("name");
if ("smime.p7m".equalsIgnoreCase(name)) {
getMessageParts(part, parts, EntityAttachment.SMIME_MESSAGE);
return parts;
} else if ("smime.p7s".equalsIgnoreCase(name)) {
getMessageParts(part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts;
} }
Log.e(ct.toString());
} }
Log.e(ct.toString());
} }
} catch (ParseException ex) {
Log.w(ex);
} }
} catch (ParseException | OutOfMemoryError ex) {
Log.w(ex); getMessageParts(imessage, parts, null);
} catch (OutOfMemoryError ex) {
Log.e(ex);
parts.warnings.add(Log.formatThrowable(ex, false)); parts.warnings.add(Log.formatThrowable(ex, false));
/* /*
java.lang.OutOfMemoryError: Failed to allocate a xxx byte allocation with yyy free bytes and zzMB until OOM java.lang.OutOfMemoryError: Failed to allocate a xxx byte allocation with yyy free bytes and zzMB until OOM
@ -2503,7 +2509,6 @@ public class MessageHelper {
*/ */
} }
getMessageParts(imessage, parts, null);
return parts; return parts;
} }

Write Preview
Loading…
Cancel
Save