The branch master has been updated via d97adfda2868aeb9e62df96216203e8120a95d6d (commit) from 67ea4beb9451ff3855877c2771dd4def0fc10a73 (commit)
- Log ----------------------------------------------------------------- commit d97adfda2868aeb9e62df96216203e8120a95d6d Author: Kevin Cadieux <ke...@microsoft.com> Date: Fri Mar 19 13:54:05 2021 -0700 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.lon...@oracle.com> Reviewed-by: Tomas Mraz <to...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14581) ----------------------------------------------------------------------- Summary of changes: test/memleaktest.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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