diff options
| author | Christopher Ferris <cferris@google.com> | 2016-02-11 15:51:31 -0800 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2016-02-12 17:30:30 -0800 |
| commit | 72df6708c829a4c6494936fdfbda6dc7e68e647b (patch) | |
| tree | 17ede0d54b6f50c3598a3fcec56f50754067690d /libc/malloc_debug/DebugData.cpp | |
| parent | 72bca4b4105e24058f3f2eca024382bedb122a30 (diff) | |
Fix the default alignment of the allocations.
In order to enforce this constraint:
The pointer returned if the allocation succeeds shall be suitably
aligned so that it may be assigned to a pointer to any type of object
and then used to access such an object in the space allocated.
Force all allocations on 32 bit systems to have 8 byte alignment,
and all allocations on 64 bit systems to have 16 byte alignment.
Add a test to verify that the allocator returns the correct alignments.
Bug: 26739265
Change-Id: I9af53279617408676b94e4ec6481b3ed7ffafc6a
Diffstat (limited to 'libc/malloc_debug/DebugData.cpp')
| -rw-r--r-- | libc/malloc_debug/DebugData.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/malloc_debug/DebugData.cpp b/libc/malloc_debug/DebugData.cpp index bf2a0f5e5..92b866d03 100644 --- a/libc/malloc_debug/DebugData.cpp +++ b/libc/malloc_debug/DebugData.cpp @@ -47,7 +47,7 @@ bool DebugData::Initialize() { need_header_ = true; // Initialize all of the static header offsets. - pointer_offset_ = BIONIC_ALIGN(sizeof(Header), sizeof(uintptr_t)); + pointer_offset_ = BIONIC_ALIGN(sizeof(Header), MINIMUM_ALIGNMENT_BYTES); if (config_.options & BACKTRACE) { backtrace.reset(new BacktraceData(config_, &pointer_offset_)); |