Chromium Code Reviews| Index: src/core/SkImageFilter.cpp |
| diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp |
| index aadf9040b0403ae1ef8d256e73f6f1aad8d2c5e5..dc1c2a4ccad985b050c694af08d68b30272fdd05 100644 |
| --- a/src/core/SkImageFilter.cpp |
| +++ b/src/core/SkImageFilter.cpp |
| @@ -63,10 +63,14 @@ SkImageFilter::SkImageFilter(int inputCount, SkFlattenableReadBuffer& buffer) { |
| } else { |
| fInputs[i] = NULL; |
| } |
| + if (!buffer.isValid()) { |
|
reed1
2013/12/05 21:35:23
Shouldn't we just abort everything if we detect th
sugoi
2013/12/05 23:27:49
So far, the idea has been that if a buffer is inva
|
| + fInputCount = i; // Do not use fInputs past that point in the destructor |
| + break; |
| + } |
| } |
| SkRect rect; |
| buffer.readRect(&rect); |
| - if (buffer.validate(SkIsValidRect(rect))) { |
| + if (buffer.isValid() && buffer.validate(SkIsValidRect(rect))) { |
| uint32_t flags = buffer.readUInt(); |
| fCropRect = CropRect(rect, flags); |
| } |