Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Guard `navigator`-object accesses in `src/`-files (issue 15728)
This commit is contained in:
Tim van der Meij 2023-10-29 11:59:32 +01:00 committed by GitHub
commit 0329b5e130
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/display/font_loader.js
View File

@ -184,6 +184,7 @@ class FontLoader {
supported = true; supported = true;
} else if ( } else if (
typeof navigator !== "undefined" && typeof navigator !== "undefined" &&
typeof navigator?.userAgent === "string" &&
// User agent string sniffing is bad, but there is no reliable way to // 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. // tell if the font is fully loaded and ready to be used with canvas.
/Mozilla\/5.0.*?rv:\d+.*? Gecko/.test(navigator.userAgent) /Mozilla\/5.0.*?rv:\d+.*? Gecko/.test(navigator.userAgent)

13
src/shared/util.js
View File

@ -616,14 +616,15 @@ class FeatureTest {
static get platform() { static get platform() {
if ( if (
(typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) ||
typeof navigator === "undefined" (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", { return shadow(this, "platform", { isMac: false });
isMac: navigator.platform.includes("Mac"),
});
} }
static get isCSSRoundSupported() { static get isCSSRoundSupported() {