arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add additional assert to FixedSizeAllocatorWithCleanup (GH #745) 

This assert checks the array we return to the caller is large enough. Spoiler alert... it is not always large enough, like on 64-bit AIX. The linker on AIX appears to align smaller than 8-bytes
pull/748/head
Jeffrey Walton 2018-11-21 23:04:00 -05:00
parent 1e8ac49b49
commit 6cf8895bf1
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
secblock.h
View File

@ -500,7 +500,10 @@ private:
// for a large T, and that is what PAD achieves. // for a large T, and that is what PAD achieves.
T* GetAlignedArray() { T* GetAlignedArray() {
T* p_array = (T*)(void*)(((byte*)m_array) + (0-(size_t)m_array)%16); T* p_array = (T*)(void*)(((byte*)m_array) + (0-(size_t)m_array)%16);
// Verify the 16-byte alignment
CRYPTOPP_ASSERT(IsAlignedOn(p_array, 16)); CRYPTOPP_ASSERT(IsAlignedOn(p_array, 16));
// Verify allocated array with pad is large enough.
CRYPTOPP_ASSERT(p_array+S <= m_array+(S+PAD));
return p_array; return p_array;
} }
// PAD is elements, not bytes, and rounded up to ensure no overflow. // PAD is elements, not bytes, and rounded up to ensure no overflow.