From 30685597a4f81c8dcd4dd7335debdb72ae450924 Mon Sep 17 00:00:00 2001 From: Martin Sebor Date: Mon, 10 May 2021 14:26:42 -0600 Subject: Use a #pragma to suppress a bogus GCC 10 warning instead of an assert [BZ 27832]. Reviewed-by: fweimer@redhat.com --- nss/makedb.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'nss/makedb.c') diff --git a/nss/makedb.c b/nss/makedb.c index 9389f6b548..8690e11e82 100644 --- a/nss/makedb.c +++ b/nss/makedb.c @@ -792,7 +792,13 @@ write_output (int fd) + nhashentries_total * sizeof (stridx_t))); header->allocate = file_offset; - /* Help GCC 10 see iov_nelts doesn't overflow the writev argument. */ +#if __GNUC_PREREQ (10, 0) && !__GNUC_PREREQ (11, 0) + DIAG_PUSH_NEEDS_COMMENT; + /* Avoid GCC 10 false positive warning: specified size exceeds maximum + object size. */ + DIAG_IGNORE_NEEDS_COMMENT (10, "-Wstringop-overflow"); +#endif + assert (iov_nelts <= INT_MAX); if (writev (fd, iov, iov_nelts) != keydataoffset) { @@ -800,6 +806,10 @@ write_output (int fd) return EXIT_FAILURE; } +#if __GNUC_PREREQ (10, 0) && !__GNUC_PREREQ (11, 0) + DIAG_POP_NEEDS_COMMENT; +#endif + return EXIT_SUCCESS; } -- cgit 1.4.1