From fcc65d5c2d0a592c2b68c8b7c79ea403071ce22a Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Sun, 28 Jan 2018 13:29:28 +0100 Subject: [PATCH] Added NULL coder to the exclude list. --- Magick++/fuzz/encoder_fuzzer.cc | 6 ------ Magick++/fuzz/encoder_list.cc | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Magick++/fuzz/encoder_fuzzer.cc b/Magick++/fuzz/encoder_fuzzer.cc index 75963df96..b339721aa 100644 --- a/Magick++/fuzz/encoder_fuzzer.cc +++ b/Magick++/fuzz/encoder_fuzzer.cc @@ -13,12 +13,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { std::string encoder = FUZZ_ENCODER; - // Due to macro foolishness, if we pass -DFUZZ_IMAGEMAGICK_ENCODER=NULL, - // FUZZ_ENCODER ends up being "__null". - if (encoder == "__null") { - encoder = "NULL"; - } - const Magick::Blob blob(Data, Size); Magick::Image image; image.magick(encoder); diff --git a/Magick++/fuzz/encoder_list.cc b/Magick++/fuzz/encoder_list.cc index 562b85037..7b6c6d050 100644 --- a/Magick++/fuzz/encoder_list.cc +++ b/Magick++/fuzz/encoder_list.cc @@ -34,6 +34,7 @@ int main() { allowedNames.push_back("YCBCR"); std::list excludeList; + excludeList.push_back("NULL"); excludeList.push_back("SCREENSHOT"); for (std::list::iterator it = coderList.begin(); it != coderList.end(); it++) -- 2.40.0