From: Kevin Cadieux <kevca@microsoft.com>
Date: Fri, 19 Mar 2021 20:54:05 +0000 (-0700)
Subject: memleaktest with MSVC's AddressSanitizer
X-Git-Tag: openssl-3.0.0-alpha16~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d97adfda2868aeb9e62df96216203e8120a95d6d;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/test/memleaktest.c b/test/memleaktest.c
index 1e07723a6f1..b48dbced0d4 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