Chromium Code Reviews| Index: src/effects/SkColorMatrixFilter.cpp |
| diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp |
| index 5b36a8f7e55df1dec60b77de2b29ba6fa81aec39..0cfc6d52652de975564e206084325c27e4804097 100644 |
| --- a/src/effects/SkColorMatrixFilter.cpp |
| +++ b/src/effects/SkColorMatrixFilter.cpp |
| @@ -308,10 +308,11 @@ void SkColorMatrixFilter::flatten(SkFlattenableWriteBuffer& buffer) const { |
| SkColorMatrixFilter::SkColorMatrixFilter(SkFlattenableReadBuffer& buffer) |
| : INHERITED(buffer) { |
| SkASSERT(buffer.getArrayCount() == 20); |
| - buffer.readScalarArray(fMatrix.fMat, 20); |
| - this->initState(fMatrix.fMat); |
| - for (int i = 0; i < 20; ++i) { |
| - buffer.validate(SkScalarIsFinite(fMatrix.fMat[i])); |
| + if (buffer.readScalarArray(fMatrix.fMat, 20)) { |
| + this->initState(fMatrix.fMat); |
| + for (int i = 0; i < 20; ++i) { |
| + buffer.validate(SkScalarIsFinite(fMatrix.fMat[i])); |
|
reed1
2013/12/05 21:35:23
Is this really invalid? Do we check for this sort
sugoi
2013/12/05 23:27:49
I doubt that infinities would be the intended beha
|
| + } |
| } |
| } |