Cheri-research/snmalloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

largealloc: rephrase pointer comparison

Browse Source
This commit is contained in:
Nathaniel Filardo
2019-05-09 20:54:15 +01:00
parent f7c131e4ac
commit 4dd77d35ab
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mem/largealloc.h
View File

@@ -294,7 +294,14 @@ namespace snmalloc
template<AllowReserve allow_reserve> template<AllowReserve allow_reserve>
bool reserve_memory(size_t need, size_t add) bool reserve_memory(size_t need, size_t add)
{ {
if ((address_cast(reserved_start) + need) > address_cast(reserved_end)) assert(reserved_start <= reserved_end);
/*
* Spell this comparison in terms of pointer subtraction like this,
* rather than "reserved_start + need < reserved_end" because the
* sum might not be representable on CHERI.
*/
if (pointer_diff(reserved_start, reserved_end) < need)
{ {
if constexpr (allow_reserve == YesReserve) if constexpr (allow_reserve == YesReserve)
{ {