aboutsummaryrefslogtreecommitdiff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-07-29 08:11:47 +0000
committerGreg McGary <greg@mcgary.org>2000-07-29 08:11:47 +0000
commit41d998a6830b3ee58bdde684a4f7908c320aad66 (patch)
treeccf14ab4c678ef83f88475698ca60b34008c5fa7 /malloc/malloc.c
parentf2897624e20cfc8e89fc30c8e8e1619ebbc1aacf (diff)
downloadglibc-41d998a6830b3ee58bdde684a4f7908c320aad66.zip
glibc-41d998a6830b3ee58bdde684a4f7908c320aad66.tar.gz
glibc-41d998a6830b3ee58bdde684a4f7908c320aad66.tar.bz2
Update.
2000-07-29 Greg McGary <greg@mcgary.org> * Rules (test-bp-inputs, make-test-out): New variables. ($(objpfx)%-bp.out): New rule. ($(objpfx)%.out): Rewrite in terms of new variables. * libio/iovswscanf.c (vswscanf): Pass _IO_FILE_plus pointer to internal function that uses vtable. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * malloc/malloc.c (mem2chunk): Define in terms of chunk_at_offset. (malloc_extend_top): Convert brk to chunk using chunk_at_offset. (chunk_align): Likewise. * time/asctime.c (ab_day_name, ab_month_name): Rewrite expression in a way that conforms to decl, and avoids spurious bounds violation. * sysdeps/arm/frame.h (struct layout): Make pointers __unbounded. * sysdeps/generic/frame.h: Likewise. * sysdeps/generic/backtrace.c (ADVANCE_STACK_FRAME): Wrap bounds around return value. (__backtrace): Qualify frame-pointer chain and return address pointers as __unbounded. Wrap bounds around variable `current'. * sysdeps/generic/segfault.c (ADVANCE_STACK_FRAME): Wrap bounds around return value. (catch_segfault): Qualify frame-pointer chain and return address pointers as __unbounded. Wrap bounds around variable `current'. * sysdeps/i386/backtrace.c (struct layout): Make pointers __unbounded. (ADVANCE_STACK_FRAME): Wrap bounds around return value. * sysdeps/powerpc/backtrace.c (struct layout): Make pointers __unbounded. (__backtrace): Qualify frame-pointer chain and return address pointers as __unbounded. Wrap bounds around variable `current'. * sysdeps/i386/addmul_1.S: s2_limb is scalar so remove bounds check. * sysdeps/i386/mul_1.S: Likewise. * sysdeps/i386/submul_1.S: Likewise. * sysdeps/i386/i586/addmul_1.S: Likewise. * sysdeps/i386/i586/mul_1.S: Add bounds checks. * sysdeps/i386/i586/submul_1.S: Likewise.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index fbdcbc6..af20ca2 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1292,7 +1292,7 @@ static void free_atfork();
/* conversion from malloc headers to user pointers, and back */
#define chunk2mem(p) ((Void_t*)((char*)(p) + 2*SIZE_SZ))
-#define mem2chunk(mem) BOUNDED_1((mchunkptr)((char*)(mem) - 2*SIZE_SZ))
+#define mem2chunk(mem) chunk_at_offset((mem), -2*SIZE_SZ)
/* pad request bytes into a usable size, return non-zero on overflow */
@@ -2513,7 +2513,7 @@ malloc_extend_top(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb;
sbrked_mem += correction;
- top(&main_arena) = (mchunkptr)brk;
+ top(&main_arena) = chunk_at_offset(brk, 0);
top_size = new_brk - brk + correction;
set_head(top(&main_arena), top_size | PREV_INUSE);
@@ -3574,7 +3574,7 @@ arena* ar_ptr; INTERNAL_SIZE_T nb; size_t alignment;
brk = (char*)mem2chunk(((m + alignment - 1)) & -(long)alignment);
if ((long)(brk - (char*)(p)) < (long)MINSIZE) brk += alignment;
- newp = (mchunkptr)brk;
+ newp = chunk_at_offset(brk, 0);
leadsize = brk - (char*)(p);
newsize = chunksize(p) - leadsize;