Source/core/svg/SVGFEColorMatrixElement.cpp - Issue 1087283002: Rework the checks for too-few values in feColorMatrix filter.

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: Source/core/svg/SVGFEColorMatrixElement.cpp

Issue 1087283002: Rework the checks for too-few values in feColorMatrix filter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Better tests Created 5 years, 8 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

« LayoutTests/svg/filters/feColorMatrix-setAttribute-crash1.html ('K') | « LayoutTests/svg/filters/feColorMatrix-setAttribute-crash2-expected.txt ('k') | Source/platform/graphics/filters/FEColorMatrix.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/svg/SVGFEColorMatrixElement.cpp

diff --git a/Source/core/svg/SVGFEColorMatrixElement.cpp b/Source/core/svg/SVGFEColorMatrixElement.cpp

index aa12c2b3c817c45db6396d24f6d17f2fa4319ef2..6eb60344ec0b1ea1449a9abfd1e1616058a4d223 100644

--- a/Source/core/svg/SVGFEColorMatrixElement.cpp

+++ b/Source/core/svg/SVGFEColorMatrixElement.cpp

@@ -66,12 +66,8 @@ bool SVGFEColorMatrixElement::setFilterEffectAttribute(FilterEffect* effect, con

FEColorMatrix* colorMatrix = static_cast<FEColorMatrix*>(effect);

if (attrName == SVGNames::typeAttr)

return colorMatrix->setType(m_type->currentValue()->enumValue());

- if (attrName == SVGNames::valuesAttr) {

- Vector<float> values = m_values->currentValue()->toFloatVector();

- if (values.size() == 20)

- return colorMatrix->setValues(m_values->currentValue()->toFloatVector());

- return false;

- }

+ if (attrName == SVGNames::valuesAttr)

+ return colorMatrix->setValues(m_values->currentValue()->toFloatVector());

ASSERT_NOT_REACHED();

return false;