summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
authorJason Evans <jasone@FreeBSD.org>2006-01-19 19:08:11 +0000
committerJason Evans <jasone@FreeBSD.org>2006-01-19 19:08:11 +0000
commitea41be77ba3ef552f4d773a26ff30f497872fcfc (patch)
tree86b21dbb05d214fcae68d881be3b614a72ac4532 /lib/libc/stdlib/malloc.c
parenta3bb22bc8e6ffaabf85eb590eed1d049dc23482c (diff)
Notes
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 32497305b7980..30edb2cc90709 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -1144,6 +1144,11 @@ static __inline size_t
region_next_size_get(region_sep_t *sep)
{
+ /* The region cannot extend past the end of the containing chunk. */
+ assert(CHUNK_ADDR2OFFSET(&sep[1])
+ + (size_t) (((sep->bits) & NEXT_SIZE_MASK) << opt_quantum_2pow)
+ <= chunk_size);
+
return ((size_t) (((sep->bits) & NEXT_SIZE_MASK) << opt_quantum_2pow));
}
@@ -1153,6 +1158,8 @@ region_next_size_set(region_sep_t *sep, size_t size)
uint32_t bits;
assert(size % quantum == 0);
+ /* The region cannot extend past the end of the containing chunk. */
+ assert(CHUNK_ADDR2OFFSET(&sep[1]) + size <= chunk_size);
bits = sep->bits;
bits &= ~NEXT_SIZE_MASK;