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
- Loading branch information
1 parent
c4bd63b
commit 3a1d8ac
Showing
3 changed files
with
42 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
30 changes: 30 additions & 0 deletions
30
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,30 @@ | ||
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 78f5b32745a0436337233e8a4b57b89263effad6..ace274501f2c1f6bb06f600abb850e737c988338 100644 | ||
--- a/lib/internal/url.js | ||
+++ b/lib/internal/url.js | ||
@@ -1394,8 +1394,8 @@ function pathToFileURL(filepath) { | ||
} | ||
|
||
function isURLInstance(fileURLOrPath) { | ||
- return fileURLOrPath != null && fileURLOrPath[searchParams] && | ||
- fileURLOrPath[searchParams][searchParams]; | ||
+ return fileURLOrPath != null && fileURLOrPath['href'] && | ||
+ fileURLOrPath['origin']; | ||
} | ||
|
||
function toPathIfFileURL(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