diff options
author | Jason Evans <jasone@FreeBSD.org> | 2006-01-19 19:20:42 +0000 |
---|---|---|
committer | Jason Evans <jasone@FreeBSD.org> | 2006-01-19 19:20:42 +0000 |
commit | 5d11758a9f6f4b7400e22d21b68e2d084368ce02 (patch) | |
tree | e98ec63db8e8e270780b9f21da05eaf9dc434f63 /lib | |
parent | ea41be77ba3ef552f4d773a26ff30f497872fcfc (diff) | |
download | src-5d11758a9f6f4b7400e22d21b68e2d084368ce02.tar.gz src-5d11758a9f6f4b7400e22d21b68e2d084368ce02.zip |
Revert addtion of assertions in revision 1.99. These assertions cause
problems in cases where regions are faked up for the purposes of red-black
tree searches, since those faked region headers reside on the stack, rather
than in a malloc chunk.
Notes
Notes:
svn path=/head/; revision=154557
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libc/stdlib/malloc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 30edb2cc9070..32497305b798 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -1144,11 +1144,6 @@ 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)); } @@ -1158,8 +1153,6 @@ 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; |