src/effects/SkColorMatrixFilter.cpp - Issue 37803002: Adding size parameter to read array functions

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: src/effects/SkColorMatrixFilter.cpp

Issue 37803002: Adding size parameter to read array functions (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Fixed comments and added test Created 7 years, 2 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: src/effects/SkColorMatrixFilter.cpp

diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp

index f7b283e01f7de04418fa40f5a3ee1ced96f9691e..0e3dd7d36ee38a5d7cd2598889fffc080c07b765 100644

--- a/src/effects/SkColorMatrixFilter.cpp

+++ b/src/effects/SkColorMatrixFilter.cpp

@@ -308,7 +308,8 @@ void SkColorMatrixFilter::flatten(SkFlattenableWriteBuffer& buffer) const {

SkColorMatrixFilter::SkColorMatrixFilter(SkFlattenableReadBuffer& buffer)

: INHERITED(buffer) {

SkASSERT(buffer.getArrayCount() == 20);

- buffer.readScalarArray(fMatrix.fMat);

+ uint32_t size = 20 * sizeof(SkScalar);

+ buffer.readScalarArray(fMatrix.fMat, size);

this->initState(fMatrix.fMat);

for (int i = 0; i < 20; ++i) {

buffer.validate(SkScalarIsFinite(fMatrix.fMat[i]));