diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 07:29:36 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 07:29:36 +0000 |
| commit | 65930a847a2461847816f2aebfaeb01f740b9e12 (patch) | |
| tree | 631041561aca71d67fe65904b6230509c1f2047f /base/security_unittest.cc | |
| parent | f5aad8be019ac4069e671849f5786ef277d40535 (diff) | |
| download | chromium_src-65930a847a2461847816f2aebfaeb01f740b9e12.zip chromium_src-65930a847a2461847816f2aebfaeb01f740b9e12.tar.gz chromium_src-65930a847a2461847816f2aebfaeb01f740b9e12.tar.bz2 | |
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
Diffstat (limited to 'base/security_unittest.cc')
| -rw-r--r-- | base/security_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
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<size_t>::max(); const size_t kArraySize2 = kMaxSizeT / kArraySize + 10; |