From: Victor Julien <vjulien@oisf.net>
Date: Wed, 27 Apr 2022 09:36:21 +0000 (+0200)
Subject: log-pcap: remove redundant check
X-Git-Tag: suricata-6.0.6~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7369%2Fhead;p=thirdparty%2Fsuricata.git

log-pcap: remove redundant check

Check is always true but confuses cppcheck:

src/log-pcap.c:1224:32: warning: Either the condition 'filename' is redundant or there is possible null pointer dereference: filename. [nullPointerRedundantCheck]
    if ((pl->prefix = SCStrdup(filename)) == NULL) {
                               ^
src/log-pcap.c:1421:9: note: Assuming that condition 'filename' is not redundant
    if (filename) {
        ^
src/log-pcap.c:1224:32: note: Null pointer dereference
    if ((pl->prefix = SCStrdup(filename)) == NULL) {
                               ^

Bug: #5291.
(cherry picked from commit 3dfbf0bf1124aab7c7060f46b364877ab25455ee)
---

diff --git a/src/log-pcap.c b/src/log-pcap.c
index 07ac49452c..28a74843ca 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -1420,10 +1420,8 @@ static OutputInitResult PcapLogInitCtx(ConfNode *conf)
                 compression_str ? compression_str : "none");
     }
 
-    if (filename) {
-        if (ParseFilename(pl, filename) != 0)
-            exit(EXIT_FAILURE);
-    }
+    if (ParseFilename(pl, filename) != 0)
+        exit(EXIT_FAILURE);
 
     SCLogInfo("using %s logging", pl->mode == LOGMODE_SGUIL ?
               "Sguil compatible" : (pl->mode == LOGMODE_MULTI ? "multi" : "normal"));