summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjasone <jasone@FreeBSD.org>2006-01-19 19:20:42 +0000
committerjasone <jasone@FreeBSD.org>2006-01-19 19:20:42 +0000
commit92d4e46d359ce7898bcc971d7e67cf0c58d29ed9 (patch)
treee98ec63db8e8e270780b9f21da05eaf9dc434f63 /lib
parent583abbb79be32fa0a4c88b5f1e4ff18e6a24f39a (diff)
downloadFreeBSD-src-92d4e46d359ce7898bcc971d7e67cf0c58d29ed9.zip
FreeBSD-src-92d4e46d359ce7898bcc971d7e67cf0c58d29ed9.tar.gz
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/stdlib/malloc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 30edb2c..3249730 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;
OpenPOWER on IntegriCloud