Fix memory leak about purged/expired flows

Create an helper to avoid similar errors in the future
Fixes: 1a62f4c7

3 files changed, 21 insertions, 18 deletions

diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index d018c1672..2ded09888 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -1829,9 +1829,7 @@ static void node_idle_scan_walker(const void *node, ndpi_VISIT which, int depth,
       if((flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) && !undetected_flows_deleted)
         undetected_flows_deleted = 1;
 
-      ndpi_free_flow_info_half(flow);
-      ndpi_free_flow_data_analysis(flow);
-      ndpi_free_flow_tls_data(flow);
+      ndpi_flow_info_free_data(flow);
       ndpi_thread_info[thread_id].workflow->stats.ndpi_flow_count--;
 
       /* adding to a queue (we can't delete it from the tree inline ) */
diff --git a/example/reader_util.c b/example/reader_util.c
index d48087f15..508777ec2 100644
--- a/example/reader_util.c
+++ b/example/reader_util.c
@@ -459,23 +459,13 @@ struct ndpi_workflow* ndpi_workflow_init(const struct ndpi_workflow_prefs * pref
 void ndpi_flow_info_freer(void *node) {
   struct ndpi_flow_info *flow = (struct ndpi_flow_info*)node;
 
-  ndpi_free_flow_info_half(flow);
-  ndpi_free_flow_data_analysis(flow);
-  ndpi_free_flow_tls_data(flow);
-
-#ifdef DIRECTION_BINS
-  ndpi_free_bin(&flow->payload_len_bin_src2dst);
-  ndpi_free_bin(&flow->payload_len_bin_dst2src);
-#else
-  ndpi_free_bin(&flow->payload_len_bin);
-#endif
-  
+  ndpi_flow_info_free_data(flow);
   ndpi_free(flow);
 }
 
 /* ***************************************************** */
 
-void ndpi_free_flow_tls_data(struct ndpi_flow_info *flow) {
+static void ndpi_free_flow_tls_data(struct ndpi_flow_info *flow) {
 
   if(flow->ssh_tls.server_names) {
     ndpi_free(flow->ssh_tls.server_names);
@@ -510,7 +500,7 @@ void ndpi_free_flow_tls_data(struct ndpi_flow_info *flow) {
 
 /* ***************************************************** */
 
-void ndpi_free_flow_data_analysis(struct ndpi_flow_info *flow) {
+static void ndpi_free_flow_data_analysis(struct ndpi_flow_info *flow) {
   if(flow->iat_c_to_s) ndpi_free_data_analysis(flow->iat_c_to_s);
   if(flow->iat_s_to_c) ndpi_free_data_analysis(flow->iat_s_to_c);
 
@@ -522,6 +512,22 @@ void ndpi_free_flow_data_analysis(struct ndpi_flow_info *flow) {
 
 /* ***************************************************** */
 
+void ndpi_flow_info_free_data(struct ndpi_flow_info *flow) {
+
+  ndpi_free_flow_info_half(flow);
+  ndpi_free_flow_data_analysis(flow);
+  ndpi_free_flow_tls_data(flow);
+
+#ifdef DIRECTION_BINS
+  ndpi_free_bin(&flow->payload_len_bin_src2dst);
+  ndpi_free_bin(&flow->payload_len_bin_dst2src);
+#else
+  ndpi_free_bin(&flow->payload_len_bin);
+#endif
+}
+
+/* ***************************************************** */
+
 void ndpi_workflow_free(struct ndpi_workflow * workflow) {
   u_int i;
 
diff --git a/example/reader_util.h b/example/reader_util.h
index d49ba6392..c94998496 100644
--- a/example/reader_util.h
+++ b/example/reader_util.h
@@ -329,9 +329,8 @@ static inline void ndpi_workflow_set_flow_giveup_callback(struct ndpi_workflow *
 int ndpi_workflow_node_cmp(const void *a, const void *b);
 void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_flow_info *flow);
 u_int32_t ethernet_crc32(const void* data, size_t n_bytes);
+void ndpi_flow_info_free_data(struct ndpi_flow_info *flow);
 void ndpi_flow_info_freer(void *node);
-void ndpi_free_flow_data_analysis(struct ndpi_flow_info *flow);
-void ndpi_free_flow_tls_data(struct ndpi_flow_info *flow);
 const char* print_cipher_id(u_int32_t cipher);
 float ndpi_flow_get_byte_count_entropy(const uint32_t byte_count[256], unsigned int num_bytes);