From 0af599f5fa2ac8500f2e2703b0be18f399149a2b Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 25 Apr 2023 07:23:17 +0200 Subject: [PATCH] log/pcap: work around scan-build fp log-pcap.c:1008:24: warning: Use of memory after it is freed [unix.Malloc] if (remove(pf->filename) != 0) { ^~~~~~~~~~~~ 1 warning generated. --- src/log-pcap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/log-pcap.c b/src/log-pcap.c index 6709774042..083d840cbd 100644 --- a/src/log-pcap.c +++ b/src/log-pcap.c @@ -1004,14 +1004,16 @@ static TmEcode PcapLogInitRingBuffer(PcapLogData *pl) if (pl->file_cnt > pl->max_files) { PcapFileName *pf = TAILQ_FIRST(&pl->pcap_file_list); while (pf != NULL && pl->file_cnt > pl->max_files) { + TAILQ_REMOVE(&pl->pcap_file_list, pf, next); + SCLogDebug("Removing PCAP file %s", pf->filename); if (remove(pf->filename) != 0) { SCLogWarning("Failed to remove PCAP file %s: %s", pf->filename, strerror(errno)); } - TAILQ_REMOVE(&pl->pcap_file_list, pf, next); PcapFileNameFree(pf); - pf = TAILQ_FIRST(&pl->pcap_file_list); pl->file_cnt--; + + pf = TAILQ_FIRST(&pl->pcap_file_list); } }