Merge pull request #151 from mendix/run/fix-4540-4543

Fixes for  RUN-4540 and RUN-4543

Author: emirmx

marketplace/release-notes/10.1.1.txt

@@ -0,0 +1,2 @@
+Added null check and close open streams.
+

src/CommunityCommons/CommunityCommons.mpr

@@ -674,18 +674,19 @@ public static boolean overlayPdf(IContext context, IMendixObject generatedDocume
 			Logging.trace(LOGNODE, "Overlay PDF start, retrieve overlay PDF");
 
 			Logging.trace(LOGNODE, "Perform overlay");
-			Overlay overlay = new Overlay();
-			overlay.setInputPDF(inputDoc);
-			overlay.setDefaultOverlayPDF(overlayDoc);
-			if (onTopOfContent == true) {
-				overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
-			} else {
-				overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
-			}
+			try (Overlay overlay = new Overlay()) {
+				overlay.setInputPDF(inputDoc);
+				overlay.setDefaultOverlayPDF(overlayDoc);
+				if (onTopOfContent) {
+					overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
+				} else {
+					overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
+				}
 
-			Logging.trace(LOGNODE, "Save result in output stream");
+				Logging.trace(LOGNODE, "Save result in output stream");
 
-			overlay.overlay(new HashMap<>()).save(baos);
+				overlay.overlay(new HashMap<>()).save(baos);
+			}
 
 			Logging.trace(LOGNODE, "Duplicate result in input stream");
 			try (InputStream overlayedContent = new ByteArrayInputStream(baos.toByteArray())) {

src/CommunityCommons/javasource/communitycommons/Misc.java

@@ -493,7 +493,12 @@ public static String sanitizeHTML(String html, List<SanitizerPolicy> policyParam
 		PolicyFactory policyFactory = null;
 
 		for (SanitizerPolicy param : policyParams) {
-			policyFactory = (policyFactory == null) ? SANITIZER_POLICIES.get(param.name()) : policyFactory.and(SANITIZER_POLICIES.get(param.name()));
+			PolicyFactory policyFactoryForParam = SANITIZER_POLICIES.get(param.name());
+			policyFactory = (policyFactory == null) ? policyFactoryForParam : policyFactory.and(policyFactoryForParam);
+		}
+
+		if (policyFactory == null) {
+			throw new IllegalArgumentException("Sanitizer policy not found.");
 		}
 
 		return sanitizeHTML(html, policyFactory);