Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: use non-symbols in isURLInstance check (#24861)
* fix: use non-symbols in isURLInstance check * update patches * update patches * update patches * update patches Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Electron Bot <anonymous@electronjs.org>
- Loading branch information
1 parent
ad47278
commit 0e7e4fe
Showing
3 changed files
with
49 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
patches/node/lib_use_non-symbols_in_isurlinstance_check.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Shelley Vohr <shelley.vohr@gmail.com> | ||
Date: Tue, 4 Aug 2020 09:17:06 -0700 | ||
Subject: lib: use non-symbols in isURLInstance check | ||
|
||
This slightly changes the conditional used to determine whether or | ||
not something is a URL instance. Since Node.js adds symbols to the URL | ||
not specified by the WHATWG, those symbols are not present in other | ||
implementations (like Blink's) and therefore can cause false negatives. | ||
|
||
This fixes that by slightly changing the check to properties present | ||
in all URL instances as specified in the WHATWG spec. | ||
|
||
Upstreamed at: https://github.com/nodejs/node/pull/34622. | ||
|
||
diff --git a/lib/internal/url.js b/lib/internal/url.js | ||
index fde643bea370c86d8a7e7f17ae8aa12894028abf..a39ba02d6f4cfaa1ca2325366cd52f50b8dbfbe7 100644 | ||
--- a/lib/internal/url.js | ||
+++ b/lib/internal/url.js | ||
@@ -1334,8 +1334,7 @@ function getPathFromURLPosix(url) { | ||
function fileURLToPath(path) { | ||
if (typeof path === 'string') | ||
path = new URL(path); | ||
- else if (path == null || !path[searchParams] || | ||
- !path[searchParams][searchParams]) | ||
+ else if (path == null || !path['origin'] || !path['href']) | ||
throw new ERR_INVALID_ARG_TYPE('path', ['string', 'URL'], path); | ||
if (path.protocol !== 'file:') | ||
throw new ERR_INVALID_URL_SCHEME('file'); | ||
@@ -1383,8 +1382,7 @@ function pathToFileURL(filepath) { | ||
} | ||
|
||
function toPathIfFileURL(fileURLOrPath) { | ||
- if (fileURLOrPath == null || !fileURLOrPath[searchParams] || | ||
- !fileURLOrPath[searchParams][searchParams]) | ||
+ if (fileURLOrPath == null || !fileURLOrPath['origin'] || !fileURLOrPath['href']) | ||
return fileURLOrPath; | ||
return fileURLToPath(fileURLOrPath); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters