diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/mhd_options.h | 6 | ||||
-rw-r--r-- | src/microhttpd/memorypool.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/mhd_options.h b/src/include/mhd_options.h index dbfc2409..85ad6555 100644 --- a/src/include/mhd_options.h +++ b/src/include/mhd_options.h | |||
@@ -156,17 +156,17 @@ | |||
156 | #endif /* MHD_ASAN_ACTIVE */ | 156 | #endif /* MHD_ASAN_ACTIVE */ |
157 | 157 | ||
158 | #if defined(MHD_ASAN_ACTIVE) && defined(HAVE_SANITIZER_ASAN_INTERFACE_H) && \ | 158 | #if defined(MHD_ASAN_ACTIVE) && defined(HAVE_SANITIZER_ASAN_INTERFACE_H) && \ |
159 | (defined(FUNC_ATTR_PTRCOMPARE_WOKRS) || defined(FUNC_ATTR_NOSANITIZE_WORKS)) | 159 | (defined(FUNC_ATTR_PTRCOMPARE_WORKS) || defined(FUNC_ATTR_NOSANITIZE_WORKS)) |
160 | #ifndef MHD_ASAN_POISON_ACTIVE | 160 | #ifndef MHD_ASAN_POISON_ACTIVE |
161 | /* Manual ASAN poisoning could be used */ | 161 | /* Manual ASAN poisoning could be used */ |
162 | #warning User memory poisoning is not active | 162 | #warning User memory poisoning is not active |
163 | #endif /* ! MHD_ASAN_POISON_ACTIVE */ | 163 | #endif /* ! MHD_ASAN_POISON_ACTIVE */ |
164 | #else /* ! (MHD_ASAN_ACTIVE && HAVE_SANITIZER_ASAN_INTERFACE_H && | 164 | #else /* ! (MHD_ASAN_ACTIVE && HAVE_SANITIZER_ASAN_INTERFACE_H && |
165 | (FUNC_ATTR_PTRCOMPARE_WOKRS || FUNC_ATTR_NOSANITIZE_WORKS)) */ | 165 | (FUNC_ATTR_PTRCOMPARE_WORKS || FUNC_ATTR_NOSANITIZE_WORKS)) */ |
166 | #ifdef MHD_ASAN_POISON_ACTIVE | 166 | #ifdef MHD_ASAN_POISON_ACTIVE |
167 | #error User memory poisoning is active, but conditions are not suitable | 167 | #error User memory poisoning is active, but conditions are not suitable |
168 | #endif /* MHD_ASAN_POISON_ACTIVE */ | 168 | #endif /* MHD_ASAN_POISON_ACTIVE */ |
169 | #endif /* ! (MHD_ASAN_ACTIVE && HAVE_SANITIZER_ASAN_INTERFACE_H && | 169 | #endif /* ! (MHD_ASAN_ACTIVE && HAVE_SANITIZER_ASAN_INTERFACE_H && |
170 | (FUNC_ATTR_PTRCOMPARE_WOKRS || FUNC_ATTR_NOSANITIZE_WORKS)) */ | 170 | (FUNC_ATTR_PTRCOMPARE_WORKS || FUNC_ATTR_NOSANITIZE_WORKS)) */ |
171 | 171 | ||
172 | #endif /* MHD_OPTIONS_H */ | 172 | #endif /* MHD_OPTIONS_H */ |
diff --git a/src/microhttpd/memorypool.c b/src/microhttpd/memorypool.c index c239a2df..5d656b47 100644 --- a/src/microhttpd/memorypool.c +++ b/src/microhttpd/memorypool.c | |||
@@ -103,7 +103,7 @@ | |||
103 | #define _MHD_POISON_MEMORY(pointer, size) (void)0 | 103 | #define _MHD_POISON_MEMORY(pointer, size) (void)0 |
104 | #define _MHD_UNPOISON_MEMORY(pointer, size) (void)0 | 104 | #define _MHD_UNPOISON_MEMORY(pointer, size) (void)0 |
105 | #else /* MHD_ASAN_POISON_ACTIVE */ | 105 | #else /* MHD_ASAN_POISON_ACTIVE */ |
106 | #if defined(FUNC_ATTR_PTRCOMPARE_WOKRS) | 106 | #if defined(FUNC_ATTR_PTRCOMPARE_WORKS) |
107 | #define _MHD_NOSANITIZE_PTRS \ | 107 | #define _MHD_NOSANITIZE_PTRS \ |
108 | __attribute__((no_sanitize("pointer-compare","pointer-subtract"))) | 108 | __attribute__((no_sanitize("pointer-compare","pointer-subtract"))) |
109 | #elif defined(FUNC_ATTR_NOSANITIZE_WORKS) | 109 | #elif defined(FUNC_ATTR_NOSANITIZE_WORKS) |