From 1deba233762198ae09c21936dad97307d310ccb3 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 27 Apr 2022 11:36:21 +0200 Subject: [PATCH] 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) --- src/log-pcap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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")); -- 2.47.2