From: Eric Leblond <el@stamus-networks.com>
Date: Mon, 16 Jun 2025 09:23:43 +0000 (+0200)
Subject: datasets: remove useless NULL check
X-Git-Tag: suricata-8.0.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13483%2Fhead;p=thirdparty%2Fsuricata.git

datasets: remove useless NULL check

Coverity did detect that the cleaning code is only reached with
Dataset *set being initialized so the check is useless.

** CID 1649392:       Null pointer dereferences  (REVERSE_INULL)
/src/datasets-context-json.c: 719           in DatajsonGet()
>>>     Null-checking "set" suggests that it may be null, but it has
already been dereferenced on all paths leading to the check.

** CID 1649391:       Null pointer dereferences  (REVERSE_INULL)
/src/datasets.c: 526           in DatasetGet()
>>>     Null-checking "set" suggests that it may be null, but it has
already been dereferenced on all paths leading to the check.
---

diff --git a/src/datasets-context-json.c b/src/datasets-context-json.c
index 630069a0cb..3cc17d22f8 100644
--- a/src/datasets-context-json.c
+++ b/src/datasets-context-json.c
@@ -716,12 +716,10 @@ Dataset *DatajsonGet(const char *name, enum DatasetTypes type, const char *load,
     DatasetUnlock();
     return set;
 out_err:
-    if (set) {
-        if (set->hash) {
-            THashShutdown(set->hash);
-        }
-        SCFree(set);
+    if (set->hash) {
+        THashShutdown(set->hash);
     }
+    SCFree(set);
     DatasetUnlock();
     return NULL;
 }
diff --git a/src/datasets.c b/src/datasets.c
index e0a46c7441..5a2daeed7c 100644
--- a/src/datasets.c
+++ b/src/datasets.c
@@ -520,12 +520,10 @@ Dataset *DatasetGet(const char *name, enum DatasetTypes type, const char *save,
     DatasetUnlock();
     return set;
 out_err:
-    if (set) {
-        if (set->hash) {
-            THashShutdown(set->hash);
-        }
-        SCFree(set);
+    if (set->hash) {
+        THashShutdown(set->hash);
     }
+    SCFree(set);
     DatasetUnlock();
     return NULL;
 }