diff options
author | Jakub Jelinek <jakub@redhat.com> | 2009-02-04 22:36:03 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2009-02-04 22:36:03 +0000 |
commit | 73c5dd45bc405428148ee740cac61a1279fe57d4 (patch) | |
tree | 878555d8c116d7ac9cb716b79e10d240fde946a3 /misc/sbrk.c | |
parent | 23a4b43d6a98912d505458daeced44b22830a773 (diff) |
Updated to fedora-glibc-20090204T2135cvs/fedora-glibc-2_9_90-3
Diffstat (limited to 'misc/sbrk.c')
-rw-r--r-- | misc/sbrk.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/misc/sbrk.c b/misc/sbrk.c index 0df60076cc..985b34749a 100644 --- a/misc/sbrk.c +++ b/misc/sbrk.c @@ -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; |