AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"Fix" some ImageFilter fuzzer issues

Browse Source 
SkClipOp.h & SkPictureFlat.h
   Invalid SkClipOps were getting through - the question here is where (for a class enum) is a good place to put the k*Mask definition.

SkPath1DPathEffect
   NaNs were getting past.

SkBlurMaskFilter
   Assert wasn't necessary since we whacked the flag on the next line.

Change-Id: I87f95ad39f4760284f881d7c4500eb82fcdba282
Reviewed-on: https://skia-review.googlesource.com/6194
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Herb Derby <herb@google.com>
This commit is contained in:
Robert Phillips 2016-12-19 11:37:37 -05:00 committed by Skia Commit-Bot
parent efa9d34ccb
commit 98624d249d
8 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gm/drawfilter.cpp
View File

@ -46,8 +46,8 @@ protected:
void onOnceBeforeDraw() override {
fBlur = SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
SkBlurMask::ConvertRadiusToSigma(10.0f),
kLow_SkBlurQuality);
SkBlurMask::ConvertRadiusToSigma(10.0f),
kLow_SkBlurQuality);
}
void onDraw(SkCanvas* canvas) override {

2
include/core/SkClipOp.h
View File

@ -61,6 +61,8 @@ enum class SkClipOp {
kXOR_private_internal_do_not_use = 3,
kReverseDifference_private_internal_do_not_use = 4,
kReplace_private_internal_do_not_use = 5,
kMax_EnumValue = kReplace_private_internal_do_not_use
};
#endif

4
include/effects/SkBlurMaskFilter.h
View File

@ -22,13 +22,13 @@ public:
static SkScalar ConvertRadiusToSigma(SkScalar radius);
enum BlurFlags {
kNone_BlurFlag = 0x00,
kNone_BlurFlag = 0x00,
/** The blur layer's radius is not affected by transforms */
kIgnoreTransform_BlurFlag = 0x01,
/** Use a smother, higher qulity blur algorithm */
kHighQuality_BlurFlag = 0x02,
/** mask for all blur flags */
kAll_BlurFlag = 0x03
kAll_BlurFlag = 0x03
};
/** Create a blur maskfilter.

13
src/core/SkPictureFlat.h
View File

@ -133,8 +133,17 @@ static inline uint32_t ClipParams_pack(SkClipOp op, bool doAA) {
return (doAABit << 4) | static_cast<int>(op);
}
static inline SkClipOp ClipParams_unpackRegionOp(uint32_t packed) {
return (SkClipOp)(packed & 0xF);
template <typename T> T asValidEnum(SkReadBuffer* buffer, uint32_t candidate) {
if (buffer->validate(candidate <= static_cast<uint32_t>(T::kMax_EnumValue))) {
return static_cast<T>(candidate);
}
return T::kMax_EnumValue;
}
static inline SkClipOp ClipParams_unpackRegionOp(SkReadBuffer* buffer, uint32_t packed) {
return asValidEnum<SkClipOp>(buffer, packed & 0xF);
}
static inline bool ClipParams_unpackDoAA(uint32_t packed) {

8
src/core/SkPicturePlayback.cpp
View File

@ -136,7 +136,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
case CLIP_PATH: {
const SkPath& path = fPictureData->getPath(reader);
uint32_t packed = reader->readInt();
SkClipOp clipOp = ClipParams_unpackRegionOp(packed);
SkClipOp clipOp = ClipParams_unpackRegionOp(reader, packed);
bool doAA = ClipParams_unpackDoAA(packed);
size_t offsetToRestore = reader->readInt();
BREAK_ON_READ_ERROR(reader);
@ -151,7 +151,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
SkRegion region;
reader->readRegion(&region);
uint32_t packed = reader->readInt();
SkClipOp clipOp = ClipParams_unpackRegionOp(packed);
SkClipOp clipOp = ClipParams_unpackRegionOp(reader, packed);
size_t offsetToRestore = reader->readInt();
BREAK_ON_READ_ERROR(reader);
@ -165,7 +165,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
SkRect rect;
reader->readRect(&rect);
uint32_t packed = reader->readInt();
SkClipOp clipOp = ClipParams_unpackRegionOp(packed);
SkClipOp clipOp = ClipParams_unpackRegionOp(reader, packed);
bool doAA = ClipParams_unpackDoAA(packed);
size_t offsetToRestore = reader->readInt();
BREAK_ON_READ_ERROR(reader);
@ -180,7 +180,7 @@ void SkPicturePlayback::handleOp(SkReadBuffer* reader,
SkRRect rrect;
reader->readRRect(&rrect);
uint32_t packed = reader->readInt();
SkClipOp clipOp = ClipParams_unpackRegionOp(packed);
SkClipOp clipOp = ClipParams_unpackRegionOp(reader, packed);
bool doAA = ClipParams_unpackDoAA(packed);
size_t offsetToRestore = reader->readInt();
BREAK_ON_READ_ERROR(reader);

2
src/effects/Sk1DPathEffect.cpp
View File

@ -205,7 +205,7 @@ void SkPath1DPathEffect::toString(SkString* str) const {
sk_sp<SkPathEffect> SkPath1DPathEffect::Make(const SkPath& path, SkScalar advance, SkScalar phase,
Style style) {
if (advance <= 0 || path.isEmpty()) {
if (advance <= 0 || !SkScalarIsFinite(advance) || path.isEmpty()) {
return nullptr;
}
return sk_sp<SkPathEffect>(new SkPath1DPathEffect(path, advance, phase, style));

15
src/effects/SkBlurMaskFilter.cpp
View File

@ -128,14 +128,12 @@ const SkScalar SkBlurMaskFilterImpl::kMAX_BLUR_SIGMA = SkIntToScalar(128);
sk_sp<SkMaskFilter> SkBlurMaskFilter::Make(SkBlurStyle style, SkScalar sigma,
const SkRect& occluder, uint32_t flags) {
SkASSERT(!(flags & ~SkBlurMaskFilter::kAll_BlurFlag));
SkASSERT(style <= kLastEnum_SkBlurStyle);
if (!SkScalarIsFinite(sigma) || sigma <= 0) {
return nullptr;
}
if ((unsigned)style > (unsigned)kLastEnum_SkBlurStyle) {
return nullptr;
}
SkASSERT(flags <= SkBlurMaskFilter::kAll_BlurFlag);
flags &= SkBlurMaskFilter::kAll_BlurFlag;
return sk_sp<SkMaskFilter>(new SkBlurMaskFilterImpl(sigma, style, occluder, flags));
}
@ -735,7 +733,12 @@ void SkBlurMaskFilterImpl::computeFastBounds(const SkRect& src,
sk_sp<SkFlattenable> SkBlurMaskFilterImpl::CreateProc(SkReadBuffer& buffer) {
const SkScalar sigma = buffer.readScalar();
const unsigned style = buffer.readUInt();
const unsigned flags = buffer.readUInt();
unsigned flags = buffer.readUInt();
buffer.validate(style <= kLastEnum_SkBlurStyle);
buffer.validate(!(flags & ~SkBlurMaskFilter::kAll_BlurFlag));
flags &= SkBlurMaskFilter::kAll_BlurFlag;
SkRect occluder;
if (buffer.isVersionLT(SkReadBuffer::kBlurMaskFilterWritesOccluder)) {

2
tests/BlurTest.cpp
View File

@ -507,7 +507,7 @@ DEF_TEST(BlurAsABlur, reporter) {
// Test asABlur for SkBlurMaskFilter
//
for (size_t i = 0; i < SK_ARRAY_COUNT(styles); ++i) {
const SkBlurStyle style = (SkBlurStyle)styles[i];
const SkBlurStyle style = styles[i];
for (size_t j = 0; j < SK_ARRAY_COUNT(sigmas); ++j) {
const SkScalar sigma = sigmas[j];
for (int flags = 0; flags <= SkBlurMaskFilter::kAll_BlurFlag; ++flags) {