diff options
author | Christopher Ferris <cferris@google.com> | 2019-03-01 16:40:59 -0800 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2019-03-01 23:56:23 -0800 |
commit | a22f5d5175df5c42ec86d2c2db250edf1f64084c (patch) | |
tree | 66d2980a1b04626c7e4fc1437e96194b958ea8f8 /libc/malloc_debug/malloc_debug.cpp | |
parent | 0771b752f1b955e7ded6ccbbf825b0ae93439eb5 (diff) |
Make aligned_alloc match the standard.
Jemalloc does not verify that the size parameter is a multiple of
alignment. Fix this since it only went into P.
Fix the unit tests, and fix malloc debug/malloc hooks to handle this
new restrictive behavior.
Bug: 126944692
Test: Ran bionic unit tests.
Test: Ran bionic unit tests with malloc hooks enabled (no new tests fail).
Test: Ran bionic unit tests with malloc debug enabled (no new tests fail).
Test: Ran malloc debug unit tests.
Change-Id: I4d50785928815679c781ca729f998454d76b9192
Diffstat (limited to 'libc/malloc_debug/malloc_debug.cpp')
-rw-r--r-- | libc/malloc_debug/malloc_debug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/malloc_debug/malloc_debug.cpp b/libc/malloc_debug/malloc_debug.cpp index 2e6afff55..f66295706 100644 --- a/libc/malloc_debug/malloc_debug.cpp +++ b/libc/malloc_debug/malloc_debug.cpp @@ -729,7 +729,7 @@ void* debug_aligned_alloc(size_t alignment, size_t size) { if (DebugCallsDisabled()) { return g_dispatch->aligned_alloc(alignment, size); } - if (!powerof2(alignment)) { + if (!powerof2(alignment) || (size % alignment) != 0) { errno = EINVAL; return nullptr; } |