summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Cadieux <kevca@microsoft.com>2021-03-19 13:54:05 -0700
committerTomas Mraz <tomas@openssl.org>2021-04-28 11:37:32 +0200
commitd97adfda2868aeb9e62df96216203e8120a95d6d (patch)
tree63ee4650f4b2d008fa8732de80de8f504cf72518
parent67ea4beb9451ff3855877c2771dd4def0fc10a73 (diff)
memleaktest with MSVC's AddressSanitizer
Disabling memleaktest under MSVC because leak detection is not a supported feature with MSVC's AddressSanitizer. Leaving ASan enabled in this case causes a test failure because the test suite is expecting the leak to be detected. CLA: trivial Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14581)
-rw-r--r--test/memleaktest.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/memleaktest.c b/test/memleaktest.c
index 1e07723a6f..b48dbced0d 100644
--- a/test/memleaktest.c
+++ b/test/memleaktest.c
@@ -20,7 +20,10 @@
# endif
#endif
/* If __SANITIZE_ADDRESS__ isn't defined, define it to be false */
-#ifndef __SANITIZE_ADDRESS__
+/* Leak detection is not yet supported with MSVC on Windows, so */
+/* set __SANITIZE_ADDRESS__ to false in this case as well. */
+#if !defined(__SANITIZE_ADDRESS__) || defined(_MSC_VER)
+# undef __SANITIZE_ADDRESS__
# define __SANITIZE_ADDRESS__ 0
#endif