lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

* malloc/malloc.c (sYSMALLOc): Don't use assert when detecting

Browse Source 
manipulated brk, use malloc_printerr.
	* misc/sbrk.c (__sbrk): Better error handling for nonsense
	requests.
This commit is contained in:
Ulrich Drepper
2009-01-30 17:47:23 +00:00
parent 8585cb7454
commit 1fdd89a78d
4 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
misc/sbrk.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,1995,1996,1997,2000,2002 Free Software Foundation, Inc.
/* Copyright (C) 1991,1995-1997,2000,2002,2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -16,8 +16,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <unistd.h>
#include <errno.h>
#include <stdint.h>
#include <unistd.h>
/* Defined in brk.c. */
extern void *__curbrk;
@ -47,7 +48,10 @@ __sbrk (intptr_t increment)
return __curbrk;
oldbrk = __curbrk;
if (__brk (oldbrk + increment) < 0)
if ((increment > 0
? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
: ((uintptr_t) oldbrk < (uintptr_t) -increment))
|| __brk (oldbrk + increment) < 0)
return (void *) -1;
return oldbrk;