github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-08 23:18:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Add some more debugging for navigation origin & process lock mismatch

Browse Source
This commit is contained in:
Shelley Vohr
2023-09-14 13:03:44 +02:00
parent 109bafc2b1
commit 38fef075fc
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/chromium/fix_crash_loading_non-standard_schemes_in_iframes.patch
View File

@@ -37,22 +37,20 @@ index 7bc2f882a1d0d9dfd4541d4da1975e0136cf275e..cc5f926bf73a0d98a0b0015391413867
}
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 8784a4a93993110879564c2cd5520e2d69f59b07..a2d6831d94623349c1ea7b7bcd53383c142c6c34 100644
index 8784a4a93993110879564c2cd5520e2d69f59b07..59bcb9969b014e5df8856f956de1587e2fcf52ec 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -10153,9 +10153,14 @@ void RenderFrameHostImpl::CommitNavigation(
@@ -10153,9 +10153,11 @@ void RenderFrameHostImpl::CommitNavigation(
ProcessLock::FromSiteInfo(GetSiteInstance()->GetSiteInfo());
auto browser_calc_origin_to_commit =
navigation_request->GetOriginToCommitWithDebugInfo();
+ url::Origin origin_to_check = browser_calc_origin_to_commit.first.value();
+ if(!common_params->url.IsStandard()) {
+ //Custom URLS fail the CanAccessDataForOrigin check with browser_calc_origin_to_commit.first.value
+ origin_to_check = url::Origin::Create(common_params->url);
+ }
+ const CanCommitStatus can_commit_status = policy->CanCommitOriginAndUrl(
+ GetProcess()->GetID(), GetSiteInstance()->GetIsolationContext(),
+ navigation_request->GetUrlInfo());
if (!process_lock.is_error_page() && !is_mhtml_subframe &&
!policy->CanAccessDataForOrigin(
- !policy->CanAccessDataForOrigin(
- GetProcess()->GetID(), browser_calc_origin_to_commit.first.value())) {
+ GetProcess()->GetID(), origin_to_check)) {
+ can_commit_status != CanCommitStatus::CAN_COMMIT_ORIGIN_AND_URL) {
SCOPED_CRASH_KEY_STRING64("CommitNavigation", "lock_url",
process_lock.ToString());
SCOPED_CRASH_KEY_STRING64(