From 6a47ff6422f6922734493b17d4579523e9b9fde4 Mon Sep 17 00:00:00 2001
From: cpq <valenok@gmail.com>
Date: Thu, 22 Sep 2022 21:05:30 +0100
Subject: [PATCH] Activate asan for mip_test

---
 Makefile           | 4 ++--
 mip/driver_stm32.c | 2 +-
 mongoose.c         | 3 +--
 test/mip_test.c    | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0d1cbce5..30fe0e46 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ ENV ?=  -e Tmp=. -e WINEDEBUG=-all
 DOCKER ?= docker run --platform linux/amd64 --rm $(ENV) -v $(CWD):$(CWD) -w $(CWD)
 VCFLAGS = /nologo /W3 /O2 /MD /I. $(DEFS) $(TFLAGS)
 IPV6 ?= 1
-ASAN ?= -fsanitize=address,undefined -fno-sanitize-recover=all
+ASAN ?= -fsanitize=address,undefined,alignment -fno-sanitize-recover=all -fno-omit-frame-pointer -fno-common
 ASAN_OPTIONS ?= detect_leaks=1
 EXAMPLES := $(dir $(wildcard examples/*/Makefile)) $(wildcard examples/stm32/nucleo-*)
 PREFIX ?= /usr/local
@@ -44,7 +44,7 @@ endif
 all: mg_prefix unamalgamated test mip_test arm examples vc98 vc17 vc22 mingw mingw++ fuzz
 
 mip_test: test/mip_test.c mongoose.c mongoose.h Makefile
-	$(CC) test/mip_test.c $(INCS) $(WARN) $(OPTS) $(C_WARN) -o $@
+	$(CC) test/mip_test.c $(INCS) $(WARN) $(OPTS) $(C_WARN) $(ASAN) -o $@
 	ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./$@
 
 examples:
diff --git a/mip/driver_stm32.c b/mip/driver_stm32.c
index e58a2732..e01858fc 100644
--- a/mip/driver_stm32.c
+++ b/mip/driver_stm32.c
@@ -68,7 +68,7 @@ static uint32_t get_hclk(void) {
   } else {
     clk = hsi;
   }
-  int hpre = (RCC->CFGR & (0x0F << 4)) >> 4;
+  uint32_t hpre = (RCC->CFGR & (15 << 4)) >> 4;
   if (hpre < 8) return clk;
 
   uint8_t ahbptab[8] = {1, 2, 3, 4, 6, 7, 8, 9};  // log2(div)
diff --git a/mongoose.c b/mongoose.c
index c90a9827..0d9cf277 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -6058,7 +6058,7 @@ static uint32_t get_hclk(void) {
   } else {
     clk = hsi;
   }
-  int hpre = (RCC->CFGR & (0x0F << 4)) >> 4;
+  uint32_t hpre = (RCC->CFGR & (15 << 4)) >> 4;
   if (hpre < 8) return clk;
 
   uint8_t ahbptab[8] = {1, 2, 3, 4, 6, 7, 8, 9};  // log2(div)
@@ -6765,7 +6765,6 @@ static void rx_dhcp(struct mip_if *ifp, struct pkt *pkt) {
       uint32_t lease = 0;
       memcpy(&lease, p + 2, sizeof(lease));
       ifp->lease_expire = ifp->now + mg_ntohl(lease) * 1000;
-      // MG_INFO(("LEASEEEEEE %lld", ifp->lease_expire - ifp->now));
     }
     p += p[1] + 2;
   }
diff --git a/test/mip_test.c b/test/mip_test.c
index 1b4af3dd..851df89c 100644
--- a/test/mip_test.c
+++ b/test/mip_test.c
@@ -1,4 +1,5 @@
 #define MG_ENABLE_SOCKET 0
+#define MG_ENABLE_LINES 1
 #define MG_ENABLE_MIP 1
 #define MG_ENABLE_PACKED_FS 0