third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp - Issue 2552163002: Fix crash when referencing a registered non-inherited custom property

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/resolver/CSSVariableResolver.cpp

Issue 2552163002: Fix crash when referencing a registered non-inherited custom property (Closed)

Patch Set: Created 4 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/LayoutTests/custom-properties/registered-property-initial.html ('K') | « third_party/WebKit/LayoutTests/custom-properties/registered-property-initial.html ('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/resolver/CSSVariableResolver.cpp

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

index 219ea54eb84c380de3b72dd9f5ea375be35acc8c..15835b956b9762884ffa6dfcc95464c345f11b4e 100644

--- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

@@ -53,7 +53,8 @@ CSSVariableData* CSSVariableResolver::valueForCustomProperty(

if (m_inheritedVariables)

variableData = m_inheritedVariables->getVariable(name);

} else {

- variableData = m_nonInheritedVariables->getVariable(name);

+ if (m_nonInheritedVariables)

+ variableData = m_nonInheritedVariables->getVariable(name);

}

if (!variableData)

return registration ? registration->initialVariableData() : nullptr;