This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: sbrk() does not set errno on overflow
- From: Andreas Schwab <schwab at suse dot de>
- To: Cyril Hrubis <chrubis at suse dot cz>
- Cc: libc-alpha at sourceware dot org
- Date: Wed, 20 May 2015 09:15:04 +0200
- Subject: Re: sbrk() does not set errno on overflow
- Authentication-results: sourceware.org; auth=none
- References: <20150519152646 dot GA2052 at rei dot suse dot de> <mvmvbfobmcm dot fsf at hawking dot suse dot de> <20150519160719 dot GB2052 at rei dot suse dot de>
Cyril Hrubis <chrubis@suse.cz> writes:
> diff --git a/misc/sbrk.c b/misc/sbrk.c
> index 87b5472..ecd4397 100644
> --- a/misc/sbrk.c
> +++ b/misc/sbrk.c
> @@ -49,8 +49,13 @@ __sbrk (intptr_t increment)
> oldbrk = __curbrk;
> if ((increment > 0
> ? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
> - : ((uintptr_t) oldbrk < (uintptr_t) -increment))
> - || __brk (oldbrk + increment) < 0)
> + : ((uintptr_t) oldbrk < (uintptr_t) -increment)))
> + {
> + __set_errno (ENOMEM);
> + return (void *) -1;
> + }
> +
> + if (__brk (oldbrk + increment) < 0)
> return (void *) -1;
>
> return oldbrk;
This looks good, but please also remove the redundant parens.
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."