From: Philippe Antoine <contact@catenacyber.fr>
Date: Tue, 3 Nov 2020 10:21:06 +0000 (+0100)
Subject: fuzz: limit memcap for datasets when fuzzing
X-Git-Tag: suricata-6.0.1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18d8164a27848338f63155dd1a3f43f036d1c634;p=thirdparty%2Fsuricata.git

fuzz: limit memcap for datasets when fuzzing
---

diff --git a/src/util-thash.c b/src/util-thash.c
index 2753dae17d..a90558066b 100644
--- a/src/util-thash.c
+++ b/src/util-thash.c
@@ -308,16 +308,16 @@ THashTableContext *THashInit(const char *cnf_prefix, size_t data_size,
     ctx->config.hash_size = hashsize > 0 ? hashsize : THASH_DEFAULT_HASHSIZE;
     /* Reset memcap in case of loading from file to the highest possible value
      unless defined by the rule keyword */
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    // limit memcap size to default when fuzzing
+    ctx->config.memcap = THASH_DEFAULT_MEMCAP;
+#else
     if (memcap > 0) {
         ctx->config.memcap = memcap;
     } else {
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-        // limit hash size to default when fuzzing
-        ctx->config.memcap = THASH_DEFAULT_MEMCAP;
-#else
         ctx->config.memcap = reset_memcap ? UINT64_MAX : THASH_DEFAULT_MEMCAP;
-#endif
     }
+#endif
     ctx->config.prealloc = THASH_DEFAULT_PREALLOC;
 
     SC_ATOMIC_INIT(ctx->counter);