libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

2003-08-19 Jeff Johnston <jjohnstn@redhat.com> 

* libc/stdlib/mallocr.c (mALLOc, rEALLOc, mEMEALIGn): Enhance
        overflow detection.
This commit is contained in:
Jeff Johnston 2003-08-19 18:09:54 +00:00
parent b16bb18af4
commit 8f0211142c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2003-08-19 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdlib/mallocr.c (mALLOc, rEALLOc, mEMEALIGn): Enhance
overflow detection.
2003-08-13 Aldy Hernandez <aldyh@redhat.com>
* libc/machine/powerpc/machine/stdlib.h: Wrap SPE functions in

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

@ -2334,7 +2334,7 @@ Void_t* mALLOc(RARG bytes) RDECL size_t bytes;
INTERNAL_SIZE_T nb = request2size(bytes); /* padded request size; */
/* Check for overflow and just fail, if so. */
if (nb > INT_MAX)
if (nb > INT_MAX || nb < bytes)
return 0;
MALLOC_LOCK;
@ -2797,7 +2797,7 @@ Void_t* rEALLOc(RARG oldmem, bytes) RDECL Void_t* oldmem; size_t bytes;
nb = request2size(bytes);
/* Check for overflow and just fail, if so. */
if (nb > INT_MAX)
if (nb > INT_MAX || nb < bytes)
return 0;
#if HAVE_MMAP
@ -3028,6 +3028,11 @@ Void_t* mEMALIGn(RARG alignment, bytes) RDECL size_t alignment; size_t bytes;
/* Call malloc with worst case padding to hit alignment. */
nb = request2size(bytes);
/* Check for overflow. */
if (nb > INT_MAX || nb < bytes)
return 0;
m = (char*)(mALLOc(RCALL nb + alignment + MINSIZE));
if (m == 0) return 0; /* propagate failure */