| Index: src/effects/SkDisplacementMapEffect.cpp
|
| diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
|
| index a0764ed223cd42a66a53b9dec06d658e64c239c0..c47819adb435e8e67b76ea60d1bb852a33ad3dc7 100644
|
| --- a/src/effects/SkDisplacementMapEffect.cpp
|
| +++ b/src/effects/SkDisplacementMapEffect.cpp
|
| @@ -128,6 +128,20 @@ void computeDisplacement(SkDisplacementMapEffect::ChannelSelectorType xChannelSe
|
| }
|
| }
|
|
|
| +bool ChannelSelectorTypeIsValid(SkDisplacementMapEffect::ChannelSelectorType channelSelector) {
|
| + switch (channelSelector) {
|
| + case SkDisplacementMapEffect::kUnknown_ChannelSelectorType:
|
| + case SkDisplacementMapEffect::kR_ChannelSelectorType:
|
| + case SkDisplacementMapEffect::kG_ChannelSelectorType:
|
| + case SkDisplacementMapEffect::kB_ChannelSelectorType:
|
| + case SkDisplacementMapEffect::kA_ChannelSelectorType:
|
| + return true;
|
| + default:
|
| + break;
|
| + }
|
| + return false;
|
| +}
|
| +
|
| } // end namespace
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -153,6 +167,9 @@ SkDisplacementMapEffect::SkDisplacementMapEffect(SkFlattenableReadBuffer& buffer
|
| fXChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
|
| fYChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.readInt();
|
| fScale = buffer.readScalar();
|
| + buffer.validateData(ChannelSelectorTypeIsValid(fXChannelSelector) &&
|
| + ChannelSelectorTypeIsValid(fYChannelSelector) &&
|
| + SkScalarIsFinite(fScale));
|
| }
|
|
|
| void SkDisplacementMapEffect::flatten(SkFlattenableWriteBuffer& buffer) const {
|
|
|