Merge pull request mozilla#17153 from Snuffleupagus/src-navigator-checks

Guard `navigator`-object accesses in `src/`-files (issue 15728)
timvandermeij · Oct 29, 2023 · 0329b5e · 0329b5e
2 parents 355bce2 + c1fef7d
commit 0329b5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/display/font_loader.js b/src/display/font_loader.js
@@ -184,6 +184,7 @@ class FontLoader {
         supported = true;
       } else if (
         typeof navigator !== "undefined" &&
+        typeof navigator?.userAgent === "string" &&
         // User agent string sniffing is bad, but there is no reliable way to
         // tell if the font is fully loaded and ready to be used with canvas.
         /Mozilla\/5.0.*?rv:\d+.*? Gecko/.test(navigator.userAgent)

diff --git a/src/shared/util.js b/src/shared/util.js
@@ -616,14 +616,15 @@ class FeatureTest {
 
   static get platform() {
     if (
-      (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
-      typeof navigator === "undefined"
+      (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) ||
+      (typeof navigator !== "undefined" &&
+        typeof navigator?.platform === "string")
     ) {
-      return shadow(this, "platform", { isMac: false });
+      return shadow(this, "platform", {
+        isMac: navigator.platform.includes("Mac"),
+      });
     }
-    return shadow(this, "platform", {
-      isMac: navigator.platform.includes("Mac"),
-    });
+    return shadow(this, "platform", { isMac: false });
   }
 
   static get isCSSRoundSupported() {