Crash under NetworkProcess::addAllowedFirstPartyForCookies() #11506
Conversation
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
|
EWS run on previous version of this PR (hash eb6e9f3)
|
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
253895_addAllowedFirstPartyForCookies_crash
branch
from
eb6e9f3
to
514fd82
Compare
|
EWS run on previous version of this PR (hash 514fd82)
|
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
253895_addAllowedFirstPartyForCookies_crash
branch
from
514fd82
to
6d2fe4a
Compare
|
EWS run on current version of this PR (hash 6d2fe4a)
|
achristensen07
approved these changes
Mar 14, 2023
| @@ -395,6 +395,9 @@ void NetworkProcess::createNetworkConnectionToWebProcess(ProcessIdentifier ident | |||
|
|
|||
| void NetworkProcess::addAllowedFirstPartyForCookies(WebCore::ProcessIdentifier processIdentifier, WebCore::RegistrableDomain&& firstPartyForCookies, LoadedWebArchive loadedWebArchive, CompletionHandler<void()>&& completionHandler) | |||
| { | |||
| if (!HashSet<WebCore::RegistrableDomain>::isValidValue(firstPartyForCookies)) | |||
There was a problem hiding this comment.
Add this to NetworkProcess::webProcessWillLoadWebArchive too
There was a problem hiding this comment.
decltype(m_allowedFirstPartiesForCookies)
There was a problem hiding this comment.
It is a little more complicated than this, here is the type:
HashMap<WebCore::ProcessIdentifier, std::pair<LoadedWebArchive, HashSet<WebCore::RegistrableDomain>>>
I only care about the inner HashSet.
There was a problem hiding this comment.
webProcessWillLoadWebArchive
webProcessWillLoadWebArchive doesn't modify the HashSet containing RegistrableDomains, only the top-level HashMap.
achristensen07
approved these changes
Mar 14, 2023
| @@ -395,6 +395,9 @@ void NetworkProcess::createNetworkConnectionToWebProcess(ProcessIdentifier ident | |||
|
|
|||
| void NetworkProcess::addAllowedFirstPartyForCookies(WebCore::ProcessIdentifier processIdentifier, WebCore::RegistrableDomain&& firstPartyForCookies, LoadedWebArchive loadedWebArchive, CompletionHandler<void()>&& completionHandler) | |||
| { | |||
| if (!HashSet<WebCore::RegistrableDomain>::isValidValue(firstPartyForCookies)) | |||
There was a problem hiding this comment.
decltype(m_allowedFirstPartiesForCookies)
https://bugs.webkit.org/show_bug.cgi?id=253895 rdar://104526219 Reviewed by Alex Christensen. Make sure the registrable domain is valid before we try inserting it into the HashSet. * Source/WebKit/NetworkProcess/NetworkProcess.cpp: (WebKit::NetworkProcess::addAllowedFirstPartyForCookies): Canonical link: https://commits.webkit.org/261656@main
webkit-commit-queue
force-pushed
the
253895_addAllowedFirstPartyForCookies_crash
branch
from
6d2fe4a
to
e2b561a
Compare
|
Committed 261656@main (e2b561a): https://commits.webkit.org/261656@main Reviewed commits have been landed. Closing PR #11506 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
e2b561a
6d2fe4a
🛠 wincairo🧪 wpe-wk2🧪 ios-wk2🧪 api-ios🧪 mac-wk1🧪 gtk-wk2🧪 api-gtk🧪 mac-AS-debug-wk2🛠 watch