#179: Fixed NPE (change ported from different branch where String was a always-non-null StringBuilder)

Benny Bottema · Benny Bottema · commit 09638a595f98 · 2018-11-07T20:32:02.000+01:00
diff --git a/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java b/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java
@@ -448,10 +448,11 @@ public static String parseMessageId(@Nonnull final MimeMessage mimeMessage) {
 	}
 
 	private static void moveInvalidEmbeddedResourcesToAttachments(ParsedMimeMessageComponents parsedComponents) {
-		final String htmlContent = parsedComponents.htmlContent.toString();
+		final String htmlContent = parsedComponents.htmlContent;
 		for (Map.Entry<String, DataSource> cidEntry : parsedComponents.cidMap.entrySet()) {
-			if (!htmlContent.contains("cid:" + extractCID(cidEntry.getKey()))) {
-				parsedComponents.attachmentList.put(cidEntry.getKey(), cidEntry.getValue());
+			String cid = extractCID(cidEntry.getKey());
+			if (htmlContent == null || !htmlContent.contains("cid:" + cid)) {
+				parsedComponents.attachmentList.put(cid, cidEntry.getValue());
 				parsedComponents.cidMap.remove(cidEntry.getKey());
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -448,10 +448,11 @@ public static String parseMessageId(@Nonnull final MimeMessage mimeMessage) {`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`private static void moveInvalidEmbeddedResourcesToAttachments(ParsedMimeMessageComponents parsedComponents) {`
`451`		`- final String htmlContent = parsedComponents.htmlContent.toString();`
	`451`	`+ final String htmlContent = parsedComponents.htmlContent;`
`452`	`452`	`for (Map.Entry<String, DataSource> cidEntry : parsedComponents.cidMap.entrySet()) {`
`453`		`- if (!htmlContent.contains("cid:" + extractCID(cidEntry.getKey()))) {`
`454`		`- parsedComponents.attachmentList.put(cidEntry.getKey(), cidEntry.getValue());`
	`453`	`+ String cid = extractCID(cidEntry.getKey());`
	`454`	`+ if (htmlContent == null \|\| !htmlContent.contains("cid:" + cid)) {`
	`455`	`+ parsedComponents.attachmentList.put(cid, cidEntry.getValue());`
`455`	`456`	`parsedComponents.cidMap.remove(cidEntry.getKey());`
`456`	`457`	`}`
`457`	`458`	`}`