From 7bf9a872ed27d7ad59a9c3bf653a46acefc8b00b Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Fri, 23 Oct 2020 12:17:47 +0200
Subject: [PATCH] Fix a couple of edge-cases in
 `PDFViewerApplication._initializeJavaScript` (PR 12432 follow-up)

 - Return early in `PDFViewerApplication._initializeJavaScript` for PDF documents without any `fieldObjects`, which is the vast majority of all documents, to prevent errors when trying to parse a non-existent object.

 - Similar to the other `PDFViewerApplication._initialize*` methods, ignore the `fieldObjects` if the document was closed before the data resolved.

 - Fix the JSDoc comment for the `generateRandomStringForSandbox` helper function, since there's currently a bit too much copy-and-paste going on :-)

 - Change `FirefoxScripting` to a class with static methods, which is consistent with the surrounding code in `web/firefoxcom.js`.
---
 web/app.js        |  8 ++++++--
 web/firefoxcom.js | 18 ++++++++++--------
 web/ui_utils.js   |  4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/web/app.js b/web/app.js
index 95fe841a0e4b4..fafb1d368a095 100644
--- a/web/app.js
+++ b/web/app.js
@@ -1345,10 +1345,14 @@ const PDFViewerApplication = {
    * @private
    */
   async _initializeJavaScript(pdfDocument) {
-    if (!AppOptions.get("enableScripting")) {
+    const objects = await pdfDocument.getFieldObjects();
+
+    if (pdfDocument !== this.pdfDocument) {
+      return; // The document was closed while the JavaScript data resolved.
+    }
+    if (!objects || !AppOptions.get("enableScripting")) {
       return;
     }
-    const objects = await pdfDocument.getFieldObjects();
     const scripting = this.externalServices.scripting;
 
     window.addEventListener("updateFromSandbox", function (event) {
diff --git a/web/firefoxcom.js b/web/firefoxcom.js
index 7c3fd5ae7b0d3..352987e22362c 100644
--- a/web/firefoxcom.js
+++ b/web/firefoxcom.js
@@ -254,17 +254,19 @@ class FirefoxComDataRangeTransport extends PDFDataRangeTransport {
   }
 }
 
-const FirefoxScripting = {
-  createSandbox(data) {
+class FirefoxScripting {
+  static createSandbox(data) {
     FirefoxCom.requestSync("createSandbox", data);
-  },
-  dispatchEventInSandbox(event, sandboxID) {
+  }
+
+  static dispatchEventInSandbox(event, sandboxID) {
     FirefoxCom.requestSync("dispatchEventInSandbox", event);
-  },
-  destroySandbox() {
+  }
+
+  static destroySandbox() {
     FirefoxCom.requestSync("destroySandbox", null);
-  },
-};
+  }
+}
 
 class FirefoxExternalServices extends DefaultExternalServices {
   static updateFindControlState(data) {
diff --git a/web/ui_utils.js b/web/ui_utils.js
index 19ea882354459..1509d90732586 100644
--- a/web/ui_utils.js
+++ b/web/ui_utils.js
@@ -1010,8 +1010,8 @@ function getActiveOrFocusedElement() {
 /**
  * Generate a random string which is not define somewhere in actions.
  *
- * @param {WaitOnEventOrTimeoutParameters}
- * @returns {Promise} A promise that is resolved with a {WaitOnType} value.
+ * @param {Object} objects - The value returned by `getFieldObjects` in the API.
+ * @returns {string} A unique string.
  */
 function generateRandomStringForSandbox(objects) {
   const allObjects = Object.values(objects).flat(2);