drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2002-08-09 Jason Tishler <jason@tishler.net> 

* libc/stdlib/mallocr.c: Include <limits.h>.
        (request2size): Change macro to do
        unsigned long comparisons and avoid signed overflow.
        (mALLOc): Add overflow check for the number of bytes to allocate.
        (rEALLOc): Ditto.
This commit is contained in:
Jeff Johnston 2002-08-09 21:33:29 +00:00
parent 037240a242
commit 659e70628e
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newlib/ChangeLog
View File

@ -1,3 +1,11 @@
2002-08-09 Jason Tishler <jason@tishler.net>
* libc/stdlib/mallocr.c: Include <limits.h>.
(request2size): Change macro to do
unsigned long comparisons and avoid signed overflow.
(mALLOc): Add overflow check for the number of bytes to allocate.
(rEALLOc): Ditto.
2002-08-09 Jeff Johnston <jjohnstn@redhat.com> 2002-08-09 Jeff Johnston <jjohnstn@redhat.com>
* configure.host: Add check for --enable-newlib-io-pos-args * configure.host: Add check for --enable-newlib-io-pos-args

13
newlib/libc/stdlib/mallocr.c
View File

@ -271,6 +271,7 @@ extern "C" {
#endif #endif
#include <stdio.h> /* needed for malloc_stats */ #include <stdio.h> /* needed for malloc_stats */
#include <limits.h> /* needed for overflow checks */
/* /*
@ -1399,8 +1400,8 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
/* pad request bytes into a usable size */ /* pad request bytes into a usable size */
#define request2size(req) \ #define request2size(req) \
(((long)((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) < \ (((unsigned long)((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) < \
(long)(MINSIZE + MALLOC_ALIGN_MASK)) ? ((MINSIZE + MALLOC_ALIGN_MASK) & ~(MALLOC_ALIGN_MASK)) : \ (unsigned long)(MINSIZE + MALLOC_ALIGN_MASK)) ? ((MINSIZE + MALLOC_ALIGN_MASK) & ~(MALLOC_ALIGN_MASK)) : \
(((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) & ~(MALLOC_ALIGN_MASK))) (((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) & ~(MALLOC_ALIGN_MASK)))
/* Check if m has acceptable alignment */ /* Check if m has acceptable alignment */
@ -2333,6 +2334,10 @@ Void_t* mALLOc(RARG bytes) RDECL size_t bytes;
INTERNAL_SIZE_T nb = request2size(bytes); /* padded request size; */ INTERNAL_SIZE_T nb = request2size(bytes); /* padded request size; */
/* Check for overflow and just fail, if so. */
if (nb > INT_MAX)
return 0;
MALLOC_LOCK; MALLOC_LOCK;
/* Check for exact match in a bin */ /* Check for exact match in a bin */
@ -2792,6 +2797,10 @@ Void_t* rEALLOc(RARG oldmem, bytes) RDECL Void_t* oldmem; size_t bytes;
nb = request2size(bytes); nb = request2size(bytes);
/* Check for overflow and just fail, if so. */
if (nb > INT_MAX)
return 0;
#if HAVE_MMAP #if HAVE_MMAP
if (chunk_is_mmapped(oldp)) if (chunk_is_mmapped(oldp))
{ {