Fix leaks and sha1 certificate detection

1 files changed, 9 insertions, 6 deletions

diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 7ad648ee6..9296d10a2 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -3835,12 +3835,10 @@ static int ndpi_init_packet_header(struct ndpi_detection_module_struct *ndpi_str
 	u_int8_t backup;
 	u_int16_t backup1, backup2;
 
-	if(flow->http.url)          ndpi_free(flow->http.url);
-	if(flow->http.content_type) ndpi_free(flow->http.content_type);
-	if(flow->http.user_agent)   ndpi_free(flow->http.user_agent);
-
-	if(flow->l4.tcp.tls.message.buffer)
-	  ndpi_free(flow->l4.tcp.tls.message.buffer);
+	if(flow->http.url)          ndpi_free(flow->http.url), flow->http.url = NULL;
+	if(flow->http.content_type) ndpi_free(flow->http.content_type), flow->http.content_type = NULL;
+	if(flow->http.user_agent)   ndpi_free(flow->http.user_agent), flow->http.user_agent = NULL;
+	if(flow->l4.tcp.tls.message.buffer) ndpi_free(flow->l4.tcp.tls.message.buffer), flow->l4.tcp.tls.message.buffer = NULL;
 
 	backup  = flow->num_processed_pkts;
 	backup1 = flow->guessed_protocol_id;
@@ -6426,6 +6424,11 @@ void ndpi_free_flow(struct ndpi_flow_struct *flow) {
 	ndpi_free(flow->l4.tcp.tls.srv_cert_fingerprint_ctx);
     }
 
+    if(flow->l4_proto == IPPROTO_TCP) {
+      if(flow->l4.tcp.tls.message.buffer)
+	ndpi_free(flow->l4.tcp.tls.message.buffer);
+    }
+
     ndpi_free(flow);
   }
 }