From 6fba6d84c3f323bb460cc31fd29b496a0432b8e1 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Thu, 2 Nov 2023 14:03:25 +0100 Subject: [PATCH 1/4] fix: remove unneeded uint checks --- app/ui/view_nano_inspect.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/ui/view_nano_inspect.c b/app/ui/view_nano_inspect.c index 3e26e15..fe9c5d8 100644 --- a/app/ui/view_nano_inspect.c +++ b/app/ui/view_nano_inspect.c @@ -41,14 +41,12 @@ void view_inspect_init(viewfunc_getInnerItem_t view_funcGetInnerItem, } bool h_paging_inspect_go_to_root_screen() { - return (viewdata.innerField.level >= 0) && - (viewdata.innerField.paging.itemIdx == 0) + return (viewdata.innerField.paging.itemIdx == 0) && (viewdata.innerField.trace[0] != 0); } bool h_paging_inspect_back_screen() { - return (viewdata.innerField.level >= 0) && - (viewdata.innerField.paging.itemIdx == (viewdata.innerField.paging.itemCount - 1)) + return (viewdata.innerField.paging.itemIdx == (viewdata.innerField.paging.itemCount - 1)) && (viewdata.innerField.trace[0] != 0); } From e71d3904ad6019005ba79ea74a3da7cc5ba1dac8 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Thu, 2 Nov 2023 14:04:07 +0100 Subject: [PATCH 2/4] fix: order properly safety check --- include/utf8.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/utf8.h b/include/utf8.h index fe2e8d9..fc7eecd 100644 --- a/include/utf8.h +++ b/include/utf8.h @@ -700,7 +700,7 @@ utf8_int8_t *c = utf8_null; size_t bytes = 0; /* Find the end of the string or stop when n is reached */ -while ('\0' != src[bytes] && bytes < n) { +while (bytes < n && '\0' != src[bytes]) { bytes++; } @@ -722,7 +722,7 @@ return utf8_null; bytes = 0; /* copy src byte-by-byte into our new utf8 string */ -while ('\0' != src[bytes] && bytes < n) { +while (bytes < n && '\0' != src[bytes]) { c[bytes] = src[bytes]; bytes++; } From f3c791d09f4afdcc5d27cb1f01342923811cb1db Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Thu, 2 Nov 2023 14:04:22 +0100 Subject: [PATCH 3/4] fix: allow usage of any clang version in fuzzer --- dockerized_build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerized_build.mk b/dockerized_build.mk index 48aee58..50332e4 100644 --- a/dockerized_build.mk +++ b/dockerized_build.mk @@ -315,7 +315,7 @@ cpp_test: .PHONY: fuzz_build fuzz_build: - cmake -B build -DCMAKE_C_COMPILER=clang-11 -DCMAKE_CXX_COMPILER=clang++-11 -DCMAKE_BUILD_TYPE=Debug -DENABLE_FUZZING=1 -DENABLE_SANITIZERS=1 . + cmake -B build -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DENABLE_FUZZING=1 -DENABLE_SANITIZERS=1 . make -C build .PHONY: fuzz From 3dc2b88a9f9af05e59e50d89bf1649253cdce140 Mon Sep 17 00:00:00 2001 From: Carlo Sala Date: Thu, 2 Nov 2023 14:04:38 +0100 Subject: [PATCH 4/4] chore: bump version --- include/zxversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zxversion.h b/include/zxversion.h index beba9cf..c30a72b 100644 --- a/include/zxversion.h +++ b/include/zxversion.h @@ -17,4 +17,4 @@ #define ZXLIB_MAJOR 19 #define ZXLIB_MINOR 9 -#define ZXLIB_PATCH 0 +#define ZXLIB_PATCH 1