| Index: src/core/SkXfermode.cpp
|
| diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
|
| index 66314958cc610b8d5d031c6217286e8566238485..eba7d2a1d8c12d7966e4220f2c8a722e22ad8621 100644
|
| --- a/src/core/SkXfermode.cpp
|
| +++ b/src/core/SkXfermode.cpp
|
| @@ -12,6 +12,7 @@
|
| #include "SkFlattenableBuffers.h"
|
| #include "SkMathPriv.h"
|
| #include "SkString.h"
|
| +#include "SkValidationUtils.h"
|
|
|
| SK_DEFINE_INST_COUNT(SkXfermode)
|
|
|
| @@ -1409,13 +1410,20 @@ public:
|
| protected:
|
| SkProcCoeffXfermode(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
|
| fMode = (SkXfermode::Mode)buffer.read32();
|
| -
|
| - const ProcCoeff& rec = gProcCoeffs[fMode];
|
| - // these may be valid, or may be CANNOT_USE_COEFF
|
| - fSrcCoeff = rec.fSC;
|
| - fDstCoeff = rec.fDC;
|
| - // now update our function-ptr in the super class
|
| - this->INHERITED::setProc(rec.fProc);
|
| + bool modeIsValid = SkIsValidMode(fMode);
|
| + if (modeIsValid) {
|
| + const ProcCoeff& rec = gProcCoeffs[fMode];
|
| + // these may be valid, or may be CANNOT_USE_COEFF
|
| + fSrcCoeff = rec.fSC;
|
| + fDstCoeff = rec.fDC;
|
| + // now update our function-ptr in the super class
|
| + this->INHERITED::setProc(rec.fProc);
|
| + } else {
|
| + fSrcCoeff = fDstCoeff = CANNOT_USE_COEFF;
|
| + }
|
| + buffer.validate(modeIsValid &&
|
| + (SkIsValidCoeff(fSrcCoeff) || (fSrcCoeff == CANNOT_USE_COEFF)) &&
|
| + (SkIsValidCoeff(fDstCoeff) || (fDstCoeff == CANNOT_USE_COEFF)));
|
| }
|
|
|
| virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {
|
|
|