mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Catch OOM on parsing message

This commit is contained in:
M66B 2021-06-07 21:12:17 +02:00
parent afcd28fafd
commit 4035e66772
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2366,9 +2366,9 @@ public class MessageHelper {
MessageParts getMessageParts() throws IOException, MessagingException { MessageParts getMessageParts() throws IOException, MessagingException {
MessageParts parts = new MessageParts(); MessageParts parts = new MessageParts();
ensureStructure();
try { try {
ensureStructure();
MimePart part = imessage; MimePart part = imessage;
if (part.isMimeType("multipart/mixed")) { if (part.isMimeType("multipart/mixed")) {
@ -2486,8 +2486,21 @@ public class MessageHelper {
Log.e(ct.toString()); Log.e(ct.toString());
} }
} }
} catch (ParseException ex) { } catch (ParseException | OutOfMemoryError ex) {
Log.w(ex); Log.w(ex);
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
at java.io.ByteArrayOutputStream.expand(ByteArrayOutputStream.java:91)
at java.io.ByteArrayOutputStream.write(ByteArrayOutputStream.java:201)
at com.sun.mail.util.ASCIIUtility.getBytes(ASCIIUtility:279)
at javax.mail.internet.MimeMessage.parse(MimeMessage:336)
at javax.mail.internet.MimeMessage.<init>(MimeMessage:199)
at eu.faircode.email.MimeMessageEx.<init>(MimeMessageEx:44)
at eu.faircode.email.MessageHelper._ensureMessage(MessageHelper:2732)
at eu.faircode.email.MessageHelper.ensureStructure(MessageHelper:2685)
at eu.faircode.email.MessageHelper.getMessageParts(MessageHelper:2368)
*/
} }
getMessageParts(imessage, parts, null); getMessageParts(imessage, parts, null);