-
Notifications
You must be signed in to change notification settings - Fork 30.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[v18.x backport] url: ensure getter access do not mutate observable symbols #48891
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -22,6 +22,7 @@ const { | |||||
ReflectOwnKeys, | ||||||
RegExpPrototypeSymbolReplace, | ||||||
SafeMap, | ||||||
SafeWeakMap, | ||||||
StringPrototypeCharAt, | ||||||
StringPrototypeCharCodeAt, | ||||||
StringPrototypeCodePointAt, | ||||||
|
@@ -99,6 +100,12 @@ const FORWARD_SLASH = /\//g; | |||||
const context = Symbol('context'); | ||||||
const searchParams = Symbol('query'); | ||||||
|
||||||
/** | ||||||
* We cannot use private fields without a breaking change, so a WeakMap is the alternative. | ||||||
* @type {WeakMap<URL,URLSearchParams>} | ||||||
*/ | ||||||
const internalSearchParams = new SafeWeakMap(); | ||||||
|
||||||
const updateActions = { | ||||||
kProtocol: 0, | ||||||
kHost: 1, | ||||||
|
@@ -179,7 +186,7 @@ class URLContext { | |||||
} | ||||||
|
||||||
function isURLSearchParams(self) { | ||||||
return self && self[searchParams] && !self[searchParams][searchParams]; | ||||||
return self?.[searchParams]; | ||||||
} | ||||||
|
||||||
class URLSearchParams { | ||||||
|
@@ -672,11 +679,12 @@ class URL { | |||||
ctx.hash_start = hash_start; | ||||||
ctx.scheme_type = scheme_type; | ||||||
|
||||||
if (this[searchParams]) { | ||||||
const alreadyInstantiatedSearchParams = internalSearchParams.get(this); | ||||||
if (alreadyInstantiatedSearchParams) { | ||||||
if (ctx.hasSearch) { | ||||||
this[searchParams][searchParams] = parseParams(this.search); | ||||||
alreadyInstantiatedSearchParams[searchParams] = parseParams(this.search); | ||||||
} else { | ||||||
this[searchParams][searchParams] = []; | ||||||
alreadyInstantiatedSearchParams[searchParams] = []; | ||||||
} | ||||||
} | ||||||
} | ||||||
|
@@ -898,11 +906,15 @@ class URL { | |||||
get searchParams() { | ||||||
if (!isURL(this)) | ||||||
throw new ERR_INVALID_THIS('URL'); | ||||||
if (this[searchParams] == null) { | ||||||
this[searchParams] = new URLSearchParams(this.search); | ||||||
this[searchParams][context] = this; | ||||||
} | ||||||
return this[searchParams]; | ||||||
|
||||||
const cachedValue = internalSearchParams.get(this); | ||||||
if (cachedValue != null) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
return cachedValue; | ||||||
|
||||||
const value = new URLSearchParams(this.search); | ||||||
value[context] = this; | ||||||
internalSearchParams.set(this, value); | ||||||
return value; | ||||||
} | ||||||
|
||||||
get hash() { | ||||||
|
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
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.