OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set errno to ENOMEM on overflow in sbrk (bug 18592)

This commit is contained in:
Cyril Hrubis 2015-05-20 13:50:00 +02:00 committed by Andreas Schwab
parent 6471190491
commit c13e078308
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-07-07 Cyril Hrubis <chrubis@suse.cz>
[BZ #18592]
* misc/sbrk.c: Set errno to ENOMEM on overflow.
2015-07-06 Wilco Dijkstra <wdijkstr@arm.com>
* sysdeps/aarch64/fpu/math_private.h (__ieee754_sqrt):

13
misc/sbrk.c
View File

@ -47,10 +47,15 @@ __sbrk (intptr_t increment)
return __curbrk;
oldbrk = __curbrk;
if ((increment > 0
? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
: ((uintptr_t) oldbrk < (uintptr_t) -increment))
|| __brk (oldbrk + increment) < 0)
if (increment > 0
? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
: ((uintptr_t) oldbrk < (uintptr_t) -increment))
{
__set_errno (ENOMEM);
return (void *) -1;
}
if (__brk (oldbrk + increment) < 0)
return (void *) -1;
return oldbrk;