From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Sun, 14 Jan 2018 15:45:45 +0000 (-0500)
Subject: Fixes for the encoder fuzzer so it runs properly
X-Git-Tag: 7.0.7-22~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdc26fec8f762bd5b8df76178a505a76e973bc82;p=imagemagick

Fixes for the encoder fuzzer so it runs properly
---

diff --git a/Magick++/fuzz/encoder_fuzzer.cc b/Magick++/fuzz/encoder_fuzzer.cc
index 16b4fcf22..7ca648852 100644
--- a/Magick++/fuzz/encoder_fuzzer.cc
+++ b/Magick++/fuzz/encoder_fuzzer.cc
@@ -5,9 +5,10 @@
 
 #include "utils.cc"
 
+#define FUZZ_ENCODER_STRING_LITERAL_X(name) FUZZ_ENCODER_STRING_LITERAL(name)
 #define FUZZ_ENCODER_STRING_LITERAL(name) #name
 #ifndef FUZZ_ENCODER
-#define FUZZ_ENCODER FUZZ_ENCODER_STRING_LITERAL(FUZZ_IMAGEMAGICK_ENCODER)
+#define FUZZ_ENCODER FUZZ_ENCODER_STRING_LITERAL_X(FUZZ_IMAGEMAGICK_ENCODER)
 #endif
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
@@ -15,7 +16,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   Magick::Image image;
   try {
     image.magick(FUZZ_ENCODER);
-    image.fileName(FUZZ_ENCODER + ':');
+    image.fileName(std::string(FUZZ_ENCODER) + ":");
     image.read(blob);
   }
   catch (Magick::Exception &e) {