diff options
author | Colin Cross <ccross@android.com> | 2016-03-10 13:01:27 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-03-10 14:53:02 -0800 |
commit | 7877df66c27c8cd27dcb809e5cbfdc38b798e5cb (patch) | |
tree | d77a82183c705cb4a0e2ebf290de217d86bc8af6 /libc/malloc_debug/tests/malloc_debug_unit_tests.cpp | |
parent | 9567c7b82cba21d3046bab5c9b1fe4e73f2629bf (diff) |
malloc_debug: fix multiplication overflow in debug_calloc
The over flow check for nmemb * bytes in debug_calloc is incorrect,
use the builtin overflow functions to check for multiplication and
addition overflow.
Change-Id: I3f1c13102621bc5380be1f69caa88dba2118f3cb
(cherry picked from commit 239838608dbe9917acddfe5a51d92350a4c8e135)
Diffstat (limited to 'libc/malloc_debug/tests/malloc_debug_unit_tests.cpp')
-rw-r--r-- | libc/malloc_debug/tests/malloc_debug_unit_tests.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp index 28729e8ac..2503981b0 100644 --- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp +++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp @@ -1290,6 +1290,12 @@ TEST_F(MallocDebugTest, overflow) { ASSERT_TRUE(pointer == nullptr); ASSERT_EQ(ENOMEM, errno); + const size_t size_t_bits = sizeof(size_t) * 8; + const size_t sqrt_size_t = 1ULL << (size_t_bits/2); + pointer = debug_calloc(sqrt_size_t + 1, sqrt_size_t); + ASSERT_TRUE(pointer == nullptr); + ASSERT_EQ(ENOMEM, errno); + pointer = debug_realloc(nullptr, SIZE_MAX); ASSERT_TRUE(pointer == nullptr); ASSERT_EQ(ENOMEM, errno); |