diff options
Diffstat (limited to 'fuzz/FuzzParsePath.cpp')
| -rw-r--r-- | fuzz/FuzzParsePath.cpp | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/fuzz/FuzzParsePath.cpp b/fuzz/FuzzParsePath.cpp index 1a597d87a0..90b99ca8e5 100644 --- a/fuzz/FuzzParsePath.cpp +++ b/fuzz/FuzzParsePath.cpp @@ -39,9 +39,13 @@ static void add_white(Fuzz* fuzz, SkString* atom) { atom->append(" "); return; } - int reps = fuzz->nextRange(0, 2); - for (int rep = 0; rep < reps; ++rep) { - int index = fuzz->nextRange(0, (int) SK_ARRAY_COUNT(gWhiteSpace) - 1); + // Use a uint8_t to conserve bytes. This makes our "fuzzed bytes footprint" + // smaller, which leads to more efficient fuzzing. + uint8_t reps; + fuzz->nextRange(&reps, 0, 2); + for (uint8_t rep = 0; rep < reps; ++rep) { + uint8_t index; + fuzz->nextRange(&index, 0, SK_ARRAY_COUNT(gWhiteSpace) - 1); if (gWhiteSpace[index]) { atom->append(&gWhiteSpace[index], 1); } @@ -60,7 +64,9 @@ static void add_comma(Fuzz* fuzz, SkString* atom) { return; } add_white(fuzz, atom); - if (fuzz->next<bool>()) { + bool b; + fuzz->next(&b); + if (b) { atom->append(","); } add_some_white(fuzz, atom); @@ -68,15 +74,20 @@ static void add_comma(Fuzz* fuzz, SkString* atom) { SkString MakeRandomParsePathPiece(Fuzz* fuzz) { SkString atom; - int index = fuzz->nextRange(0, (int) SK_ARRAY_COUNT(gLegal) - 1); + uint8_t index; + fuzz->nextRange(&index, 0, SK_ARRAY_COUNT(gLegal) - 1); const Legal& legal = gLegal[index]; gEasy ? atom.append("\n") : add_white(fuzz, &atom); - char symbol = legal.fSymbol | (fuzz->next<bool>() ? 0x20 : 0); + bool b; + fuzz->next(&b); + char symbol = legal.fSymbol | (b ? 0x20 : 0); atom.append(&symbol, 1); - int reps = fuzz->nextRange(1, 3); + uint8_t reps; + fuzz->nextRange(&reps, 1, 3); for (int rep = 0; rep < reps; ++rep) { for (int index = 0; index < legal.fScalars; ++index) { - SkScalar coord = fuzz->nextRange(0.0f, 100.0f); + SkScalar coord; + fuzz->nextRange(&coord, 0.0f, 100.0f); add_white(fuzz, &atom); atom.appendScalar(coord); if (rep < reps - 1 && index < legal.fScalars - 1) { @@ -85,11 +96,15 @@ SkString MakeRandomParsePathPiece(Fuzz* fuzz) { add_some_white(fuzz, &atom); } if ('A' == legal.fSymbol && 1 == index) { - atom.appendScalar(fuzz->nextRange(-720.0f, 720.0f)); + SkScalar s; + fuzz->nextRange(&s, -720.0f, 720.0f); + atom.appendScalar(s); add_comma(fuzz, &atom); - atom.appendU32(fuzz->nextRange(0, 1)); + fuzz->next(&b); + atom.appendU32(b); add_comma(fuzz, &atom); - atom.appendU32(fuzz->nextRange(0, 1)); + fuzz->next(&b); + atom.appendU32(b); add_comma(fuzz, &atom); } } @@ -100,8 +115,9 @@ SkString MakeRandomParsePathPiece(Fuzz* fuzz) { DEF_FUZZ(ParsePath, fuzz) { SkPath path; SkString spec; - uint32_t count = fuzz->nextRange(0, 40); - for (uint32_t i = 0; i < count; ++i) { + uint8_t count; + fuzz->nextRange(&count, 0, 40); + for (uint8_t i = 0; i < count; ++i) { spec.append(MakeRandomParsePathPiece(fuzz)); } SkDebugf("SkParsePath::FromSVGString(%s, &path);\n",spec.c_str()); |