From 1571980917a471c2b54ef0547432ef4bb2a4772b Mon Sep 17 00:00:00 2001
From: emanuele-f <black.silver@hotmail.it>
Date: Sun, 26 Jun 2022 23:05:52 +0200
Subject: [PATCH] Fix possible unaligned access

---
 app/src/main/jni/tests/test/dump_api.c | 6 +++++-
 app/src/main/jni/tests/test_utils.c    | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/jni/tests/test/dump_api.c b/app/src/main/jni/tests/test/dump_api.c
index 4482009b..301ab5da 100644
--- a/app/src/main/jni/tests/test/dump_api.c
+++ b/app/src/main/jni/tests/test/dump_api.c
@@ -85,10 +85,14 @@ static void max_pkts_per_flow() {
     zdtun_pkt_t pkt;
     zdtun_ip_t *expected_ip;
     zdtun_ip_t *remote_ip;
+    zdtun_ip_t src_ip, dst_ip;
 
     assert0(zdtun_parse_pkt(pd->zdt, (char*)buf, rec.incl_len, &pkt));
+    src_ip = pkt.tuple.src_ip;
+    dst_ip = pkt.tuple.dst_ip;
+
     remote_ip = (zdtun_cmp_ip(4, &pkt.tuple.src_ip, &local_ip) == 0) ?
-        &pkt.tuple.dst_ip : &pkt.tuple.src_ip;
+        &dst_ip : &src_ip;
 
 #if 0
     char ip[INET_ADDRSTRLEN];
diff --git a/app/src/main/jni/tests/test_utils.c b/app/src/main/jni/tests/test_utils.c
index ccbb7598..e8111314 100644
--- a/app/src/main/jni/tests/test_utils.c
+++ b/app/src/main/jni/tests/test_utils.c
@@ -126,11 +126,12 @@ conn_and_tuple_t* assert_conn(pcapdroid_t *pd, int ipproto, const char *dst_ip,
 
   for(int i=0; i < pd->new_conns.cur_items; i++) {
     conn_and_tuple_t *conn = &pd->new_conns.items[i];
+    zdtun_ip_t dst_ip = conn->tuple.dst_ip;
 
     if((conn->tuple.ipproto == ipproto) &&
        (conn->tuple.dst_port == dst_port) &&
        (conn->tuple.ipver == ipver) &&
-       (!zdtun_cmp_ip(ipver, &conn->tuple.dst_ip, &ip)) &&
+       (!zdtun_cmp_ip(ipver, &dst_ip, &ip)) &&
        ((info == NULL) || ((conn->data->info != NULL) && !strcmp(info, conn->data->info)))) {
       found = conn;
       break;
@@ -259,4 +260,4 @@ static void free_payload_chunks(pcapdroid_t *pd) {
   }
 
   free(chunks_lists_heads);
-}
\ No newline at end of file
+}