From 41c0132c59a31c6d8bcc711b94b0859349e88f9b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 23 May 2021 12:29:54 -0400
Subject: Improve support for sandboxed iframes (#1704)

* Add more tests

* Improve handling of errors from setupFrame

* Passively handle errors when contentDocument is null
---
 ext/js/comm/frame-client.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ext/js/comm')

diff --git a/ext/js/comm/frame-client.js b/ext/js/comm/frame-client.js
index d15cee30..c74a9913 100644
--- a/ext/js/comm/frame-client.js
+++ b/ext/js/comm/frame-client.js
@@ -156,7 +156,12 @@ class FrameClient {
             // Prevent unhandled rejections
             frameLoadedPromise.catch(() => {}); // NOP
 
-            setupFrame(frame);
+            try {
+                setupFrame(frame);
+            } catch (e) {
+                cleanup();
+                reject(e);
+            }
         });
     }
 
-- 
cgit v1.2.3