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

fix coincident fuzzer

Browse Source 
This fuzzer has very large Y values that cause the
points to sort incorrectly by t. Exit out as soon
as this is detected.

TBR=reed@google.com
BUG=561121

Review URL: https://codereview.chromium.org/1507803002
This commit is contained in:
caryclark 2015-12-07 12:18:02 -08:00 committed by Commit bot
parent d4c24f6749
commit a3375e4251
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pathops/SkOpCoincidence.cpp
View File

@ -110,11 +110,17 @@ bool SkOpCoincidence::addExpanded(SkChunkAlloc* allocator
if (startPart < oStartPart) {
double newT = oStartPtT->fT + oStartRange * startPart;
newPt = oStart->segment()->addT(newT, SkOpSegment::kAllowAlias, allocator);
if (!newPt) {
return false;
}
newPt->fPt = test->pt();
test->ptT()->addOpp(newPt);
} else {
double newT = startPtT->fT + startRange * oStartPart;
newPt = start->segment()->addT(newT, SkOpSegment::kAllowAlias, allocator);
if (!newPt) {
return false;
}
newPt->fPt = oTest->pt();
oTest->ptT()->addOpp(newPt);
}

3
src/pathops/SkOpSegment.cpp
View File

@ -362,6 +362,9 @@ SkOpPtT* SkOpSegment::addT(double t, AllowAlias allowAlias, SkChunkAlloc* alloca
}
if (t < result->fT) {
SkOpSpan* prev = result->span()->prev();
if (!prev) {
return nullptr;
}
SkOpSpan* span = insert(prev, allocator);
span->init(this, prev, t, pt);
this->debugValidate();

13
tests/PathOpsSimplifyTest.cpp
View File

@ -5055,11 +5055,24 @@ path.close();
REPORTER_ASSERT(reporter, !Simplify(path, &path));
}
static void fuzz_59(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
path.moveTo(SkBits2Float(0x430c0000), SkBits2Float(0xce58f41c)); // 140, -9.09969e+08f
path.lineTo(SkBits2Float(0x43480000), SkBits2Float(0xce58f419)); // 200, -9.09969e+08f
path.lineTo(SkBits2Float(0x42200000), SkBits2Float(0xce58f41b)); // 40, -9.09969e+08f
path.lineTo(SkBits2Float(0x43700000), SkBits2Float(0xce58f41b)); // 240, -9.09969e+08f
path.lineTo(SkBits2Float(0x428c0000), SkBits2Float(0xce58f419)); // 70, -9.09969e+08f
path.lineTo(SkBits2Float(0x430c0000), SkBits2Float(0xce58f41c)); // 140, -9.09969e+08f
path.close();
REPORTER_ASSERT(reporter, !Simplify(path, &path));
}
static void (*skipTest)(skiatest::Reporter* , const char* filename) = 0;
static void (*firstTest)(skiatest::Reporter* , const char* filename) = 0;
static void (*stopTest)(skiatest::Reporter* , const char* filename) = 0;
static TestDesc tests[] = {
TEST(fuzz_59),
TEST(fuzz_twister2),
TEST(fuzz_twister),
TEST(fuzz994s_3414),