7ffa40cedb
This CL renames FuzzPath() to FuzzNicePath() to remind us that it's meant to create paths that a user could reasonably want to create in good faith, to pass to Skia via its API, etc. Then, add fuzz_nice_rect(), and have FuzzNicePath() use that to create its rectangles and use FuzzNiceMatrix() to create its matrices, just like we already use FuzzNiceRRect() to create rounded rectangles and FuzzNicePath() itself to create sub-paths. Using fuzz_nice_rect() should be the fix for the attached bug. Using FuzzNiceMatrix() is by analogy, more preemptive. While we're at it, rename BuildPath to FuzzEvilPath, so the contrast with FuzzNicePath is more clear. Update the assertions that we create a valid path in FuzzNicePath() to tell us where things went wrong if they do. Bug: oss-fuzz:10667, skia:8384 Change-Id: I6d802182a62815cd969c65cf0479609f64b1da55 Reviewed-on: https://skia-review.googlesource.com/156840 Reviewed-by: Kevin Lubick <kjlubick@google.com> Commit-Queue: Kevin Lubick <kjlubick@google.com> Auto-Submit: Mike Klein <mtklein@google.com>
36 lines
1.1 KiB
C++
36 lines
1.1 KiB
C++
/*
|
|
* Copyright 2018 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Fuzz.h"
|
|
#include "FuzzCommon.h"
|
|
#include "SkPathMeasure.h"
|
|
|
|
void inline ignoreResult(bool ) {}
|
|
|
|
DEF_FUZZ(PathMeasure, fuzz) {
|
|
uint8_t bits;
|
|
fuzz->next(&bits);
|
|
SkScalar distance[6];
|
|
for (auto index = 0; index < 6; ++index) {
|
|
fuzz->next(&distance[index]);
|
|
}
|
|
SkPath path;
|
|
FuzzEvilPath(fuzz, &path, SkPath::Verb::kDone_Verb);
|
|
SkRect bounds = path.getBounds();
|
|
SkScalar maxDim = SkTMax(bounds.width(), bounds.height());
|
|
SkScalar resScale = maxDim / 1000;
|
|
SkPathMeasure measure(path, bits & 1, resScale);
|
|
SkPoint position;
|
|
SkVector tangent;
|
|
ignoreResult(measure.getPosTan(distance[0], &position, &tangent));
|
|
SkPath dst;
|
|
ignoreResult(measure.getSegment(distance[1], distance[2], &dst, (bits >> 1) & 1));
|
|
ignoreResult(measure.nextContour());
|
|
ignoreResult(measure.getPosTan(distance[3], &position, &tangent));
|
|
ignoreResult(measure.getSegment(distance[4], distance[5], &dst, (bits >> 2) & 1));
|
|
}
|