Skip to content

Commit a80d7c6

Browse files
POP3 crashes webapp when mail has .eml attached (#678)
Issue:101552 Co-authored-by: tomas-sexenian <[email protected]>
1 parent 51237d0 commit a80d7c6

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

gxmail/src/main/java/com/genexus/internet/POP3SessionJavaMail.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,12 @@ private void handlePart(Part part, GXMailMessage gxmessage) throws MessagingExce
301301
if (this.downloadAttachments && (disposition!=null && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE) || disposition.equalsIgnoreCase("UNKNOWN"))))
302302
{
303303
String fileName = "";
304-
if (part.getFileName() != null || (isXForwardedFor && ((MimeMessage) part.getContent()).getFileName() != null))
305-
fileName = MimeUtility.decodeText(part.getContent() instanceof MimeMessage ? ((MimeMessage) part.getContent()).getFileName() : part.getFileName());
306-
else if (!(part.getContent() instanceof MimeMessage) || ((MimeMessage) part.getContent()).getFileName() == null)
307-
fileName = SpecificImplementation.GXutil.getTempFileName("tmp");
304+
if (part.getFileName() != null)
305+
fileName = MimeUtility.decodeText(part.getFileName());
306+
else if (isXForwardedFor && ((MimeMessage) part.getContent()).getFileName() != null)
307+
fileName = MimeUtility.decodeText(((MimeMessage) part.getContent()).getFileName());
308+
else if (!(part.getContent() instanceof MimeMessage) || ((MimeMessage) part.getContent()).getFileName() == null)
309+
fileName = SpecificImplementation.GXutil.getTempFileName("tmp");
308310

309311
String cid = getAttachmentContentId(part);
310312
if (disposition.equalsIgnoreCase(Part.INLINE) && !cid.isEmpty())

0 commit comments

Comments
 (0)