fix: Enable debug flag for ubsan.

Otherwise the nullability annotations are compiled out in attributes.h.
TokTok · Dec 9, 2023 · 8238f31 · 8238f31
1 parent 65b3375
commit 8238f31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.circleci/cmake-ubsan b/.circleci/cmake-ubsan
@@ -6,9 +6,10 @@ CACHEDIR="$HOME/cache"
 
 . ".github/scripts/flags-$CC.sh"
 add_flag -Werror
+add_flag -D_DEBUG
 add_flag -fdiagnostics-color=always
 add_flag -fno-omit-frame-pointer
-add_flag -fno-sanitize-recover=all
+add_flag -fsanitize-trap=all
 add_flag -fsanitize=undefined,nullability,local-bounds,float-divide-by-zero,integer
 add_flag -fno-sanitize=implicit-conversion,unsigned-integer-overflow
 # Enable extra checks. We only do this on ubsan because it shows useful error

diff --git a/toxcore/attributes.h b/toxcore/attributes.h
@@ -18,7 +18,7 @@
 #define GNU_PRINTF(f, a)
 #endif
 
-#if defined(__GNUC__) && defined(_DEBUG) && !defined(__OPTIMIZE__)
+#if defined(__GNUC__) && (!defined(__OPTIMIZE__) || defined(_DEBUG))
 #define non_null(...) __attribute__((__nonnull__(__VA_ARGS__)))
 #else
 #define non_null(...)