]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
log-pcap: remove redundant check
authorVictor Julien <vjulien@oisf.net>
Wed, 27 Apr 2022 09:36:21 +0000 (11:36 +0200)
committerVictor Julien <vjulien@oisf.net>
Wed, 27 Apr 2022 10:21:43 +0000 (12:21 +0200)
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.

src/log-pcap.c

index f3d88eee1097d2022a3d68b73a8e0332aa870153..a7a5ccd8c4d27fb6b7b06eb719e24b76f194dc26 100644 (file)
@@ -1418,10 +1418,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"));