third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp - Issue 1510963002: Ensure we don't crash when asking for variables that don't exist from the computed style.

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/css/ComputedStyleCSSValueMapping.cpp

Issue 1510963002: Ensure we don't crash when asking for variables that don't exist from the computed style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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/core/css/CSSComputedStyleDeclaration.cpp ('K') | « third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.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/css/ComputedStyleCSSValueMapping.cpp

diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

index 1e24a945f694ca207029653a8f68403182f80670..dd8e4a26dfbe86c0dbc3b644385ea7a2fd22cc81 100644

--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

@@ -1356,6 +1356,10 @@ static PassRefPtrWillBeRawPtr<CSSValue> valueForScrollSnapCoordinate(const Vecto

PassRefPtrWillBeRawPtr<CSSValue> ComputedStyleCSSValueMapping::get(const AtomicString customPropertyName, const ComputedStyle& style)

{

+ CSSVariableData* data = style.variables()->getVariable(customPropertyName);

+ if (!data)

+ return nullptr;

return CSSCustomPropertyDeclaration::create(customPropertyName, style.variables()->getVariable(customPropertyName));

Timothy Loh 2015/12/08 23:53:54 Since you already looked it up, just use the local

}