From 2fe82ce0d62731b1b9855bae2bd3b9f331710021 Mon Sep 17 00:00:00 2001
From: Philippe Antoine <contact@catenacyber.fr>
Date: Sat, 16 May 2020 14:30:13 +0200
Subject: [PATCH] fuzz: do not reuse global variable named suricata

---
 src/tests/fuzz/fuzz_applayerparserparse.c |  4 ++--
 src/tests/fuzz/fuzz_decodepcapfile.c      |  4 ++--
 src/tests/fuzz/fuzz_sigpcap.c             | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/tests/fuzz/fuzz_applayerparserparse.c b/src/tests/fuzz/fuzz_applayerparserparse.c
index 5aaae352b2..e91ac4138b 100644
--- a/src/tests/fuzz/fuzz_applayerparserparse.c
+++ b/src/tests/fuzz/fuzz_applayerparserparse.c
@@ -29,7 +29,7 @@ AppLayerParserThreadCtx *alp_tctx = NULL;
  * destination port (uint16_t) */
 
 const uint8_t separator[] = {0x01, 0xD5, 0xCA, 0x7A};
-SCInstance suricata;
+SCInstance surifuzz;
 uint64_t forceLayer = 0;
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
@@ -59,7 +59,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
         //redirect logs to /tmp
         ConfigSetLogDirectory("/tmp/");
 
-        PostConfLoadedSetup(&suricata);
+        PostConfLoadedSetup(&surifuzz);
         alp_tctx = AppLayerParserThreadCtxAlloc();
         const char* forceLayerStr = getenv("FUZZ_APPLAYER");
         if (forceLayerStr) {
diff --git a/src/tests/fuzz/fuzz_decodepcapfile.c b/src/tests/fuzz/fuzz_decodepcapfile.c
index 58244d2ea4..da8147eb06 100644
--- a/src/tests/fuzz/fuzz_decodepcapfile.c
+++ b/src/tests/fuzz/fuzz_decodepcapfile.c
@@ -16,7 +16,7 @@
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
 static int initialized = 0;
-SCInstance suricata;
+SCInstance surifuzz;
 
 const char configNoChecksum[] = "\
 %YAML 1.1\n\
@@ -48,7 +48,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
             abort();
         }
 
-        PostConfLoadedSetup(&suricata);
+        PostConfLoadedSetup(&surifuzz);
 
         RunModeInitialize();
         TimeModeSetOffline();
diff --git a/src/tests/fuzz/fuzz_sigpcap.c b/src/tests/fuzz/fuzz_sigpcap.c
index 43b10f0765..83a8bba89e 100644
--- a/src/tests/fuzz/fuzz_sigpcap.c
+++ b/src/tests/fuzz/fuzz_sigpcap.c
@@ -32,7 +32,7 @@ ThreadVars tv;
 DecodeThreadVars *dtv;
 //FlowWorkerThreadData
 void *fwd;
-SCInstance suricata;
+SCInstance surifuzz;
 
 const char configNoChecksum[] = "\
 %YAML 1.1\n\
@@ -155,14 +155,14 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
         if (ConfYamlLoadString(configNoChecksum, strlen(configNoChecksum)) != 0) {
             abort();
         }
-        suricata.sig_file = strdup("/tmp/fuzz.rules");
-        suricata.sig_file_exclusive = 1;
+        surifuzz.sig_file = strdup("/tmp/fuzz.rules");
+        surifuzz.sig_file_exclusive = 1;
         //loads rules after init
-        suricata.delayed_detect = 1;
+        surifuzz.delayed_detect = 1;
 
-        PostConfLoadedSetup(&suricata);
+        PostConfLoadedSetup(&surifuzz);
         PreRunPostPrivsDropInit(run_mode);
-        PostConfLoadedDetectSetup(&suricata);
+        PostConfLoadedDetectSetup(&surifuzz);
 
         memset(&tv, 0, sizeof(tv));
         dtv = DecodeThreadVarsAlloc(&tv);
@@ -197,16 +197,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     }
     if (pos > 0 && pos < size) {
         // dump signatures to a file so as to reuse SigLoadSignatures
-        if (TestHelperBufferToFile(suricata.sig_file, data, pos-1) < 0) {
+        if (TestHelperBufferToFile(surifuzz.sig_file, data, pos-1) < 0) {
             return 0;
         }
     } else {
-        if (TestHelperBufferToFile(suricata.sig_file, data, pos) < 0) {
+        if (TestHelperBufferToFile(surifuzz.sig_file, data, pos) < 0) {
             return 0;
         }
     }
 
-    if (DetectEngineReload(&suricata) < 0) {
+    if (DetectEngineReload(&surifuzz) < 0) {
         return 0;
     }
     if (pos < size) {
-- 
2.47.2