From 65930a847a2461847816f2aebfaeb01f740b9e12 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Mon, 7 Oct 2013 07:29:36 +0000 Subject: Revert 227006 "Revert 226984 "Disable CallocOverflow under Mac/A..." > Revert 226984 "Disable CallocOverflow under Mac/ASAN" > > > Disable CallocOverflow under Mac/ASAN > > > > BUG=304125 > > TBR=kcc@chromium.org > > > > Review URL: https://codereview.chromium.org/25986003 > > TBR=jochen@chromium.org > > Review URL: https://codereview.chromium.org/26001003 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/26210003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227258 0039d316-1c4b-4281-b951-d872f2087c98 --- base/security_unittest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'base/security_unittest.cc') diff --git a/base/security_unittest.cc b/base/security_unittest.cc index 5b266b0..d37bbd2 100644 --- a/base/security_unittest.cc +++ b/base/security_unittest.cc @@ -216,7 +216,13 @@ bool CallocReturnsNull(size_t nmemb, size_t size) { } // Test if calloc() can overflow. -TEST(SecurityTest, CallocOverflow) { +// Fails on Mac under ASAN. http://crbug.com/304125 +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) +#define MAYBE_CallocOverflow DISABLED_CallocOverflow +#else +#define MAYBE_CallocOverflow CallocOverflow +#endif +TEST(SecurityTest, MAYBE_CallocOverflow) { const size_t kArraySize = 4096; const size_t kMaxSizeT = numeric_limits::max(); const size_t kArraySize2 = kMaxSizeT / kArraySize + 10; -- cgit v1.1