From 48a1291b3773421e5cc9f548deffc0eec3c0444f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 4 Sep 2023 17:07:33 +0200 Subject: [PATCH] argv-iter tests: Avoid gcc -Wanalyzer-out-of-bounds warning. * tests/test-argv-iter.c (main): Simplify logic. --- ChangeLog | 3 +++ tests/test-argv-iter.c | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b72a900a7..08a06e203a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2023-09-04 Bruno Haible + argv-iter tests: Avoid gcc -Wanalyzer-out-of-bounds warning. + * tests/test-argv-iter.c (main): Simplify logic. + crypto/{gc-rijndael,rijndael} tests: Fix some gcc -Wshadow warnings. * tests/test-gc-rijndael.c (main): Rename local variable 'i' to 'round'. * tests/test-rijndael.c (main): Likewise. diff --git a/tests/test-argv-iter.c b/tests/test-argv-iter.c index ea5803ab46..8d97da9146 100644 --- a/tests/test-argv-iter.c +++ b/tests/test-argv-iter.c @@ -86,15 +86,14 @@ main (void) ASSERT ((i == n_found) == (ai_err == AI_ERR_EOF)); ASSERT ((s == NULL) ^ (ai_err == AI_ERR_OK)); ASSERT (ai_err == AI_ERR_OK || ai_err == AI_ERR_EOF); - if (ai_err == AI_ERR_OK) - ++n_found; if (ai_err == AI_ERR_EOF) break; /* In stream mode, the strings are equal, but in argv mode the actual pointers are equal. */ ASSERT (use_stream - ? STREQ (s, av[i][n_found - 1]) - : s == av[i][n_found - 1]); + ? STREQ (s, av[i][n_found]) + : s == av[i][n_found]); + ++n_found; } ASSERT (argv_iter_n_args (ai) == i); argv_iter_free (ai); -- 2.39.5