From 479e9b3f2135707d4bfd13bf6c2ad1a242ea6cfc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 Apr 1998 10:15:16 +0000 Subject: Update. 1998-04-15 Ulrich Drepper * iconv/gconv_simple.c (__gconv_transform_ucs4_ascii): Fix typo in last change. 1998-04-14 Andreas Schwab * elf/dl-minimal.c (__strtol_internal): Correct range check. Fix return value on overflow. 1998-04-14 Andreas Schwab * sysdeps/posix/mkstemp.c (mkstemp): Change value and v to 64 bits. 1998-04-14 Andreas Schwab * malloc/mtrace.c (mtrace): Use standard function setvbuf instead of non-standard function setbuffer. 1998-04-15 Andreas Jaeger * stdio-common/perror.c: Include for __strerror_r. --- elf/dl-minimal.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'elf') diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c index c9a0575fd0..b0c8c465e4 100644 --- a/elf/dl-minimal.c +++ b/elf/dl-minimal.c @@ -247,15 +247,12 @@ __strtol_internal (const char *nptr, char **endptr, int base, int group) { unsigned long int digval = *nptr - '0'; if (result > LONG_MAX / 10 - || (result == (sign - ? (unsigned long int) LONG_MAX - : (unsigned long int) LONG_MAX + 1) / 10 - && digval > (sign - ? (unsigned long int) LONG_MAX - : (unsigned long int) LONG_MAX + 1) % 10)) + || (sign > 0 ? result == LONG_MAX / 10 && digval > LONG_MAX % 10 + : (result == ((unsigned long int) LONG_MAX + 1) / 10 + && digval > ((unsigned long int) LONG_MAX + 1) % 10))) { errno = ERANGE; - return LONG_MAX * sign; + return sign > 0 ? LONG_MAX : LONG_MIN; } result *= 10; result += digval; -- cgit 1.4.1