From e9709992e2c0c6d174cbfb927de6961b45f4594d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 2 Feb 2019 12:08:44 +1100 Subject: [PATCH] Have the fuzzers check for internal errors --- fuzz/c/fuzzlib/fuzzlib.c | 9 ++++++++- fuzz/c/std/zlib_fuzzer.c | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fuzz/c/fuzzlib/fuzzlib.c b/fuzz/c/fuzzlib/fuzzlib.c index a74c55ce..0b78e898 100644 --- a/fuzz/c/fuzzlib/fuzzlib.c +++ b/fuzz/c/fuzzlib/fuzzlib.c @@ -15,6 +15,7 @@ #include #include #include +#include #ifndef WUFFS_INCLUDE_GUARD #error "Wuffs' .h files need to be included before this file" @@ -53,7 +54,13 @@ static const char* llvmFuzzerTestOneInput(const uint8_t* data, size_t size) { .closed = true, }), }); - return fuzz(wuffs_base__io_buffer__reader(&src), hash); + + const char* msg = fuzz(wuffs_base__io_buffer__reader(&src), hash); + if (msg && strstr(msg, "internal error:")) { + fprintf(stderr, "internal errors shouldn't occur: \"%s\"\n", msg); + intentional_segfault(); + } + return msg; } #ifdef __cplusplus diff --git a/fuzz/c/std/zlib_fuzzer.c b/fuzz/c/std/zlib_fuzzer.c index 50bab3dc..61caf3d3 100644 --- a/fuzz/c/std/zlib_fuzzer.c +++ b/fuzz/c/std/zlib_fuzzer.c @@ -79,7 +79,8 @@ const char* fuzz(wuffs_base__io_reader src_reader, uint32_t hash) { break; } if (dst.meta.wi == 0) { - fprintf(stderr, "wuffs_zlib__decoder__decode made no progress\n"); + fprintf(stderr, + "wuffs_zlib__decoder__decode_io_writer made no progress\n"); intentional_segfault(); } }