From: Bhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Date: Tue, 4 Aug 2020 06:49:16 +0000 (+0000)
Subject: Merge pull request #2356 in SNORT/snort3 from ~NEHASH4/snort3:flow_fix to master
X-Git-Tag: 3.0.2-4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6092005224ca4ae3113b0ace11c4d7c96aa1d23e;p=thirdparty%2Fsnort3.git

Merge pull request #2356 in SNORT/snort3 from ~NEHASH4/snort3:flow_fix to master

Squashed commit of the following:

commit 6b6d8d037c4ab324336eaad20011f4c4de9a337b
Author: Neha Sharma <nehash4@cisco.com>
Date:   Wed Jul 29 07:26:25 2020 -0400

    flow: fixing free_flow_data logic
---

diff --git a/src/flow/flow.cc b/src/flow/flow.cc
index fd7cd595a..3dc36b39c 100644
--- a/src/flow/flow.cc
+++ b/src/flow/flow.cc
@@ -301,16 +301,13 @@ void Flow::free_flow_data(uint32_t proto)
 
 void Flow::free_flow_data()
 {
-    FlowData* fd = flow_data;
-
-    while (fd)
+    while (flow_data)
     {
-        FlowData* tmp = fd;
-        fd = fd->next;
+        FlowData* tmp = flow_data;
+        flow_data = flow_data->next;
         tmp->update_deallocations(tmp->size_of());
         delete tmp;
     }
-    flow_data = nullptr;
 }
 
 void Flow::call_handlers(Packet* p, bool eof)