diff options
| -rw-r--r-- | fuzz/Fuzz.h | 6 | ||||
| -rw-r--r-- | fuzz/FuzzPaeth.cpp | 6 | ||||
| -rw-r--r-- | fuzz/fuzz.cpp | 44 | ||||
| -rw-r--r-- | gyp/fuzz.gyp | 8 |
4 files changed, 34 insertions, 30 deletions
diff --git a/fuzz/Fuzz.h b/fuzz/Fuzz.h index cf5bcb9ead..f5083ef8e6 100644 --- a/fuzz/Fuzz.h +++ b/fuzz/Fuzz.h @@ -17,15 +17,13 @@ class Fuzz : SkNoncopyable { public: explicit Fuzz(SkData*); + uint8_t nextB(); uint32_t nextU(); float nextF(); - // These return a value in [min, max). - uint32_t nextURange(uint32_t min, uint32_t max); - float nextFRange(float min, float max); - private: SkAutoTUnref<SkData> fBytes; + int fNextByte; }; struct Fuzzable { diff --git a/fuzz/FuzzPaeth.cpp b/fuzz/FuzzPaeth.cpp index aa7deb09e2..d7c139ce7a 100644 --- a/fuzz/FuzzPaeth.cpp +++ b/fuzz/FuzzPaeth.cpp @@ -33,8 +33,8 @@ static uint8_t paeth_alt(uint8_t a, uint8_t b, uint8_t c) { } DEF_FUZZ(Paeth, fuzz) { - int a = fuzz->nextU(), - b = fuzz->nextU(), - c = fuzz->nextU(); + auto a = fuzz->nextB(), + b = fuzz->nextB(), + c = fuzz->nextB(); ASSERT(paeth_alt(a,b,c) == paeth_std(a,b,c)); } diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index 6e31790951..929ba7a4cf 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -6,35 +6,41 @@ */ #include "Fuzz.h" -#include "SkCommandLineFlags.h" - -DEFINE_string2(match, m, "", "The usual match patterns, applied to name."); -DEFINE_string2(bytes, b, "", "Path to file containing fuzzed bytes."); int main(int argc, char** argv) { - SkCommandLineFlags::Parse(argc, argv); - SkAutoTUnref<SkData> bytes; - if (!FLAGS_bytes.isEmpty()) { - bytes.reset(SkData::NewFromFileName(FLAGS_bytes[0])); - } + ASSERT(argc > 2); + const char* name = argv[1]; + const char* path = argv[2]; + + SkAutoTUnref<SkData> bytes(SkData::NewFromFileName(path)); + Fuzz fuzz(bytes); for (auto r = SkTRegistry<Fuzzable>::Head(); r; r = r->next()) { auto fuzzable = r->factory(); - if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, fuzzable.name)) { - SkDebugf("Running %s...\n", fuzzable.name); - Fuzz fuzz(bytes); + if (0 == strcmp(name, fuzzable.name)) { fuzzable.fn(&fuzz); + return 0; } } - return 0; + return 1; } -Fuzz::Fuzz(SkData* bytes) : fBytes(SkSafeRef(bytes)) {} +Fuzz::Fuzz(SkData* bytes) : fBytes(SkSafeRef(bytes)), fNextByte(0) {} + +template <typename T> +static T read(const SkData* data, int* next) { + ASSERT(sizeof(T) <= data->size()); + if (*next + sizeof(T) > data->size()) { + *next = 0; + } + T val; + memcpy(&val, data->bytes() + *next, sizeof(T)); + *next += sizeof(T); + return val; +} -// These methods are all TODO(kjlubick). -uint32_t Fuzz::nextU() { return 0; } -float Fuzz::nextF() { return 0.0f; } -uint32_t Fuzz::nextURange(uint32_t min, uint32_t max) { return min; } -float Fuzz::nextFRange(float min, float max) { return min; } +uint8_t Fuzz::nextB() { return read<uint8_t >(fBytes, &fNextByte); } +uint32_t Fuzz::nextU() { return read<uint32_t>(fBytes, &fNextByte); } +float Fuzz::nextF() { return read<float >(fBytes, &fNextByte); } diff --git a/gyp/fuzz.gyp b/gyp/fuzz.gyp index 40845a1653..4290ff5fb5 100644 --- a/gyp/fuzz.gyp +++ b/gyp/fuzz.gyp @@ -9,9 +9,9 @@ 'target_name': 'fuzz', 'type': 'executable', 'sources': [ '<!@(python find.py ../fuzz "*.cpp")' ], - 'dependencies': [ - 'flags.gyp:flags', - 'skia_lib.gyp:skia_lib', - ], + 'dependencies': [ 'skia_lib.gyp:skia_lib' ], + 'xcode_settings': { + 'DEAD_CODE_STRIPPING': 'YES', + }, }], } |