* [PATCH] stdlib: Avoid undefined behavior in stdlib/tst-labs
@ 2023-05-16 21:35 Florian Weimer
2023-05-17 0:19 ` Siddhesh Poyarekar
0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2023-05-16 21:35 UTC (permalink / raw)
To: libc-alpha; +Cc: Siddhesh Poyarekar, Joe Simmons-Talbott
The last loop could attempt to overflow beyond INT_MAX on 32-bit
architectures.
Also switch to GNU style.
---
stdlib/tst-labs.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/stdlib/tst-labs.c b/stdlib/tst-labs.c
index 92b456745a..a8d2381f87 100644
--- a/stdlib/tst-labs.c
+++ b/stdlib/tst-labs.c
@@ -25,25 +25,26 @@
static int do_test (void)
{
- long i;
+ long int i;
- TEST_COMPARE(labs(LONG_MAX), LONG_MAX);
- TEST_COMPARE(labs(LONG_MIN + 1), LONG_MAX);
- TEST_COMPARE(labs(-1), 1);
- TEST_COMPARE(labs(0), 0);
- TEST_COMPARE(labs(1), 1);
+ TEST_COMPARE (labs (LONG_MAX), LONG_MAX);
+ TEST_COMPARE (labs (LONG_MIN + 1), LONG_MAX);
+ TEST_COMPARE (labs (-1), 1);
+ TEST_COMPARE (labs (0), 0);
+ TEST_COMPARE (labs (1), 1);
for (i = LONG_MIN + 1; i < LONG_MIN + INT_MAX; i += LARGE_PRIME)
- TEST_COMPARE(labs(i), -i);
+ TEST_COMPARE (labs (i), -i);
- for (i = LONG_MAX - INT_MAX; i < LONG_MAX - LARGE_PRIME; i += LARGE_PRIME)
- TEST_COMPARE(labs(i), i);
+ for (i = LONG_MAX - INT_MAX; i < LONG_MAX - LARGE_PRIME;
+ i += LARGE_PRIME)
+ TEST_COMPARE (labs (i), i);
for (i = INT_MIN + 1; i < 0; i += LARGE_PRIME)
- TEST_COMPARE(labs(i), -i);
+ TEST_COMPARE (labs (i), -i);
- for (i = 0; i < INT_MAX; i += LARGE_PRIME)
- TEST_COMPARE(labs(i), i);
+ for (i = 0; i <= INT_MAX - LARGE_PRIME; i += LARGE_PRIME)
+ TEST_COMPARE (labs (i), i);
return EXIT_SUCCESS;
}
base-commit: 641c4c2b7eb80e2cb2121b1c31096158091a6419
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] stdlib: Avoid undefined behavior in stdlib/tst-labs
2023-05-16 21:35 [PATCH] stdlib: Avoid undefined behavior in stdlib/tst-labs Florian Weimer
@ 2023-05-17 0:19 ` Siddhesh Poyarekar
0 siblings, 0 replies; 2+ messages in thread
From: Siddhesh Poyarekar @ 2023-05-17 0:19 UTC (permalink / raw)
To: Florian Weimer, libc-alpha; +Cc: Siddhesh Poyarekar, Joe Simmons-Talbott
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
On 2023-05-16 17:35, Florian Weimer via Libc-alpha wrote:
> The last loop could attempt to overflow beyond INT_MAX on 32-bit
> architectures.
>
> Also switch to GNU style.
>
> ---
> stdlib/tst-labs.c | 25 +++++++++++++------------
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/stdlib/tst-labs.c b/stdlib/tst-labs.c
> index 92b456745a..a8d2381f87 100644
> --- a/stdlib/tst-labs.c
> +++ b/stdlib/tst-labs.c
> @@ -25,25 +25,26 @@
>
> static int do_test (void)
> {
> - long i;
> + long int i;
>
> - TEST_COMPARE(labs(LONG_MAX), LONG_MAX);
> - TEST_COMPARE(labs(LONG_MIN + 1), LONG_MAX);
> - TEST_COMPARE(labs(-1), 1);
> - TEST_COMPARE(labs(0), 0);
> - TEST_COMPARE(labs(1), 1);
> + TEST_COMPARE (labs (LONG_MAX), LONG_MAX);
> + TEST_COMPARE (labs (LONG_MIN + 1), LONG_MAX);
> + TEST_COMPARE (labs (-1), 1);
> + TEST_COMPARE (labs (0), 0);
> + TEST_COMPARE (labs (1), 1);
>
> for (i = LONG_MIN + 1; i < LONG_MIN + INT_MAX; i += LARGE_PRIME)
> - TEST_COMPARE(labs(i), -i);
> + TEST_COMPARE (labs (i), -i);
>
> - for (i = LONG_MAX - INT_MAX; i < LONG_MAX - LARGE_PRIME; i += LARGE_PRIME)
> - TEST_COMPARE(labs(i), i);
> + for (i = LONG_MAX - INT_MAX; i < LONG_MAX - LARGE_PRIME;
> + i += LARGE_PRIME)
> + TEST_COMPARE (labs (i), i);
>
> for (i = INT_MIN + 1; i < 0; i += LARGE_PRIME)
> - TEST_COMPARE(labs(i), -i);
> + TEST_COMPARE (labs (i), -i);
>
> - for (i = 0; i < INT_MAX; i += LARGE_PRIME)
> - TEST_COMPARE(labs(i), i);
> + for (i = 0; i <= INT_MAX - LARGE_PRIME; i += LARGE_PRIME)
> + TEST_COMPARE (labs (i), i);
>
> return EXIT_SUCCESS;
> }
>
> base-commit: 641c4c2b7eb80e2cb2121b1c31096158091a6419
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-17 0:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-16 21:35 [PATCH] stdlib: Avoid undefined behavior in stdlib/tst-labs Florian Weimer
2023-05-17 0:19 ` Siddhesh Poyarekar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).