* malloc/malloc.c (request2size): Take care of overflow in
	addition.
This commit is contained in:
Ulrich Drepper 1999-07-07 14:29:02 +00:00
parent 1823e76b95
commit 597d10a00a
2 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,8 @@
1999-07-07 Ulrich Drepper <drepper@cygnus.com>
* malloc/malloc.c (request2size): Take care of overflow in
addition.
* sysdeps/posix/getcwd.c: Correct last patch. Handle getcwd
(NULL, != 0) correctly.

View File

@ -1263,8 +1263,9 @@ static void free_atfork();
#define request2size(req, nb) \
((nb = (req) + (SIZE_SZ + MALLOC_ALIGN_MASK)),\
((long)nb <= 0 ? 1 : ((nb < (MINSIZE + MALLOC_ALIGN_MASK) ? (nb = MINSIZE) :\
(nb &= ~MALLOC_ALIGN_MASK)), 0)))
((long)nb <= 0 || nb < (INTERNAL_SIZE_T) (req) \
? 1 : ((nb < (MINSIZE + MALLOC_ALIGN_MASK) \
? (nb = MINSIZE) : (nb &= ~MALLOC_ALIGN_MASK)), 0)))
/* Check if m has acceptable alignment */