third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp - Issue 1367933003: CSP source *.x.y should not match host x.y

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/frame/csp/ContentSecurityPolicy.cpp

Issue 1367933003: CSP source *.x.y should not match host x.y (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 5 years, 3 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:

Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

index 601b66535037f5f7b3d77c60a933c98215561240..85167e069743e3d1d0fe1ca0b050c28fad75867a 100644

--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

@@ -223,7 +223,7 @@ DEFINE_TRACE(ContentSecurityPolicy)

Document* ContentSecurityPolicy::document() const

{

- return m_executionContext->isDocument() ? toDocument(m_executionContext) : nullptr;

+ return (m_executionContext && m_executionContext->isDocument()) ? toDocument(m_executionContext) : nullptr;

}

void ContentSecurityPolicy::copyStateFrom(const ContentSecurityPolicy* other)