From: Dirk Lemstra <dirk@git.imagemagick.org>
Date: Sun, 14 Jan 2018 00:24:33 +0000 (+0100)
Subject: Moved resource limit variable to utils.cc.
X-Git-Tag: 7.0.7-22~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cc92b14462a7169c39007053c37509034a25334;p=imagemagick

Moved resource limit variable to utils.cc.
---

diff --git a/Magick++/fuzz/crop_fuzzer.cc b/Magick++/fuzz/crop_fuzzer.cc
index 011c12d07..2b181dc59 100644
--- a/Magick++/fuzz/crop_fuzzer.cc
+++ b/Magick++/fuzz/crop_fuzzer.cc
@@ -5,8 +5,6 @@
 
 #include "utils.cc"
 
-static FuzzingResourceLimits kFuzzLimits;
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   uint16_t Width;
   uint16_t Height;
diff --git a/Magick++/fuzz/encoder_fuzzer.cc b/Magick++/fuzz/encoder_fuzzer.cc
index 2a2f49149..16b4fcf22 100644
--- a/Magick++/fuzz/encoder_fuzzer.cc
+++ b/Magick++/fuzz/encoder_fuzzer.cc
@@ -5,8 +5,6 @@
 
 #include "utils.cc"
 
-static FuzzingResourceLimits kFuzzLimits;
-
 #define FUZZ_ENCODER_STRING_LITERAL(name) #name
 #ifndef FUZZ_ENCODER
 #define FUZZ_ENCODER FUZZ_ENCODER_STRING_LITERAL(FUZZ_IMAGEMAGICK_ENCODER)
diff --git a/Magick++/fuzz/enhance_fuzzer.cc b/Magick++/fuzz/enhance_fuzzer.cc
index ac2ddd3fb..6d3b44de0 100644
--- a/Magick++/fuzz/enhance_fuzzer.cc
+++ b/Magick++/fuzz/enhance_fuzzer.cc
@@ -5,8 +5,6 @@
 
 #include "utils.cc"
 
-static FuzzingResourceLimits kFuzzLimits;
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   const Magick::Blob blob(Data, Size);
   Magick::Image image;
diff --git a/Magick++/fuzz/huffman_decode_fuzzer.cc b/Magick++/fuzz/huffman_decode_fuzzer.cc
index e10bb3e5e..bf2d9e854 100644
--- a/Magick++/fuzz/huffman_decode_fuzzer.cc
+++ b/Magick++/fuzz/huffman_decode_fuzzer.cc
@@ -5,8 +5,6 @@
 
 #include "utils.cc"
 
-static FuzzingResourceLimits kFuzzLimits;
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   const Magick::Blob blob(Data, Size);
   Magick::Image image;
diff --git a/Magick++/fuzz/rotate_fuzzer.cc b/Magick++/fuzz/rotate_fuzzer.cc
index 6db922bb6..0928db638 100644
--- a/Magick++/fuzz/rotate_fuzzer.cc
+++ b/Magick++/fuzz/rotate_fuzzer.cc
@@ -5,8 +5,6 @@
 
 #include "utils.cc"
 
-static FuzzingResourceLimits kFuzzLimits;
-
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   if (Size < sizeof(double)) {
     return 0;
diff --git a/Magick++/fuzz/utils.cc b/Magick++/fuzz/utils.cc
index 3a80b5768..b70b05ad1 100644
--- a/Magick++/fuzz/utils.cc
+++ b/Magick++/fuzz/utils.cc
@@ -1,12 +1,14 @@
 #include <Magick++/ResourceLimits.h>
 
-class FuzzingResourceLimits {
+class FuzzingLimits {
 public:
-    FuzzingResourceLimits() {
-        Magick::ResourceLimits::memory(1000000000);
-    }
+  FuzzingLimits() {
+    Magick::ResourceLimits::memory(1000000000);
+  }
 };
 
+FuzzingLimits fuzzingLimits;
+
 #if BUILD_MAIN
 #include "encoder_format.h"