From 17373444801c501d8c672feafabfacdb74bf4640 Mon Sep 17 00:00:00 2001
From: kkapsner <github@mail.kkapsner.de>
Date: Tue, 11 Jun 2019 23:09:13 +0200
Subject: [PATCH] document.write and document.writeln protection broke pages

Fixes #365
---
 lib/iframeProtection.js | 54 ++++++++++++++++++++++-------------------
 releaseNotes.txt        |  1 +
 versions/updates.json   |  4 +++
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/lib/iframeProtection.js b/lib/iframeProtection.js
index 6457747..383c2f1 100644
--- a/lib/iframeProtection.js
+++ b/lib/iframeProtection.js
@@ -159,20 +159,22 @@
 			"write"
 		);
 		const documentWrite = documentWriteDescriptor.value;
-		documentWriteDescriptor.value = exportFunction(function write(str){
-			str = "" + str;
-			// weird problem with waterfox and google docs
-			const parts = (
-				str.match(/^\s*<!doctype/i) &&
-				!str.match(/frame/i)
-			)? [str]: str.split(/(?=<)/);
-			const length = parts.length;
-			const scripts = window.document.getElementsByTagName("script");
-			for (let i = 0; i < length; i += 1){
-				documentWrite.call(this, parts[i]);
-				allCallback();
-				if (scripts.length && scripts[scripts.length - 1].src){
-					observe();
+		documentWriteDescriptor.value = exportFunction(function write(markup){
+			for (let i = 0, l = arguments.length; i < l; i += 1){
+				const str = "" + arguments[i];
+				// weird problem with waterfox and google docs
+				const parts = (
+					str.match(/^\s*<!doctype/i) &&
+					!str.match(/frame/i)
+				)? [str]: str.split(/(?=<)/);
+				const length = parts.length;
+				const scripts = window.document.getElementsByTagName("script");
+				for (let i = 0; i < length; i += 1){
+					documentWrite.call(this, parts[i]);
+					allCallback();
+					if (scripts.length && scripts[scripts.length - 1].src){
+						observe();
+					}
 				}
 			}
 		}, window);
@@ -186,19 +188,21 @@
 			"writeln"
 		);
 		const documentWriteln = documentWritelnDescriptor.value;
-		documentWritelnDescriptor.value = exportFunction(function writeln(str){
-			str = "" + str;
-			const parts = str.split(/(?=<)/);
-			const length = parts.length - 1;
-			const scripts = window.document.getElementsByTagName("script");
-			for (let i = 0; i < length; i += 1){
-				documentWrite.call(this, parts[i]);
-				allCallback();
-				if (scripts.length && scripts[scripts.length - 1].src){
-					observe();
+		documentWritelnDescriptor.value = exportFunction(function writeln(markup){
+			for (let i = 0, l = arguments.length; i < l; i += 1){
+				const str = "" + arguments[i];
+				const parts = str.split(/(?=<)/);
+				const length = parts.length;
+				const scripts = window.document.getElementsByTagName("script");
+				for (let i = 0; i < length; i += 1){
+					documentWrite.call(this, parts[i]);
+					allCallback();
+					if (scripts.length && scripts[scripts.length - 1].src){
+						observe();
+					}
 				}
 			}
-			documentWriteln.call(this, parts[length]);
+			documentWriteln.call(this, "");
 		}, window);
 		Object.defineProperty(wrappedWindow.HTMLDocument.prototype, "writeln", documentWritelnDescriptor);
 	};
diff --git a/releaseNotes.txt b/releaseNotes.txt
index 253aef1..7cf1dc4 100644
--- a/releaseNotes.txt
+++ b/releaseNotes.txt
@@ -8,6 +8,7 @@ Version 0.5.11:
 	
 	fixes:
 		- improved protection of (i)frame properties
+		- document.write and document.writeln protection broke pages
 	
 	known issues:
 		- if a data URL is blocked the page action button does not appear
diff --git a/versions/updates.json b/versions/updates.json
index 27687af..0a56846 100644
--- a/versions/updates.json
+++ b/versions/updates.json
@@ -13,6 +13,10 @@
 				{
 					"version": "0.5.11Alpha20190611",
 					"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-0.5.11Alpha20190611-an+fx.xpi"
+				},
+				{
+					"version": "0.5.11Alpha20190612",
+					"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-0.5.11Alpha20190612-an+fx.xpi"
 				}
 			]
 		}