third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp - Issue 1718403002: Fix security checks when navigating remote frames to javascript: URLs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

Issue 1718403002: Fix security checks when navigating remote frames to javascript: URLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix check Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp ('K') | « third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

index cfa82039cce6ec957d62d48125a42d95245c3e86..2a0c62e18e90c47fb84a22bb89375021bc3e68a9 100644

--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

@@ -59,8 +59,7 @@ bool HTMLFrameElementBase::isURLAllowed() const

const KURL& completeURL = document().completeURL(m_URL);

if (protocolIsJavaScript(completeURL)) {

- Document* contentDoc = this->contentDocument();

- if (contentDoc && !ScriptController::canAccessFromCurrentOrigin(contentDoc->frame()))

+ if (contentFrame() && !ScriptController::canAccessFromCurrentOrigin(document(), contentFrame()))

return false;

}

« third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp ('K') | « third_party/WebKit/Source/bindings/core/v8/ScriptController.cpp ('k') | no next file » | no next file with comments »