From fea3991ad168ee0a69a35c7be15e0732f2351d56 Mon Sep 17 00:00:00 2001
From: Ivan Nardi <12729895+IvanNardi@users.noreply.github.com>
Date: Tue, 19 Oct 2021 12:07:47 +0200
Subject: Fix some invalid memory reads (#1350)

`ndpi_detection_giveup()` (and any functions called by it) can't access
`ndpi_detection_module_struct->packet` anymore since 730c236.

Sync unit tests results

Close #1348
---
 src/lib/ndpi_utils.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/lib/ndpi_utils.c')

diff --git a/src/lib/ndpi_utils.c b/src/lib/ndpi_utils.c
index 652107a19..c8206a066 100644
--- a/src/lib/ndpi_utils.c
+++ b/src/lib/ndpi_utils.c
@@ -2110,15 +2110,14 @@ static void ndpi_handle_risk_exceptions(struct ndpi_detection_module_struct *ndp
   }
 
   /* TODO: add IPv6 support */
-  struct ndpi_packet_struct *packet = &ndpi_str->packet;
   if(!flow->ip_risk_mask_evaluated) {
-    if(packet->iph) {
+    if(flow->is_ipv6 == 0) {
       struct in_addr pin;
 
-      pin.s_addr = packet->iph->saddr;
+      pin.s_addr = flow->saddr;
       flow->risk_mask &= ndpi_host_ip_risk_ptree_match(ndpi_str, &pin);
 
-      pin.s_addr = packet->iph->daddr;
+      pin.s_addr = flow->daddr;
       flow->risk_mask &= ndpi_host_ip_risk_ptree_match(ndpi_str, &pin);
     }
 
-- 
cgit v1.2.3