public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] string: Fix bug-strncat1 with fortify enabled Date: Mon, 24 Jul 2023 18:54:49 +0000 (GMT) [thread overview] Message-ID: <20230724185449.4750D3858D32@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=85ac7edcdf67010c223541936243427213ac87a6 commit 85ac7edcdf67010c223541936243427213ac87a6 Author: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> Date: Fri Jul 21 09:18:16 2023 -0300 string: Fix bug-strncat1 with fortify enabled If fortify is enabled, the truncated output warning is issued by the wrapper itself: bug-strncat1.c: In function ‘main’: bug-strncat1.c:14:3: error: ‘__builtin___strncat_chk’ output truncated copying 1 byte from a string of length 2 [-Werror=stringop-truncation] 14 | strncat (d, "\5\6", 1); | ^ Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Diff: --- string/bug-strncat1.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/string/bug-strncat1.c b/string/bug-strncat1.c index 65a7ed58c2..cdd2141191 100644 --- a/string/bug-strncat1.c +++ b/string/bug-strncat1.c @@ -1,9 +1,16 @@ #undef __USE_STRING_INLINES #define __USE_STRING_INLINES +#include <sys/cdefs.h> +#include <libc-diag.h> +#if __GNUC_PREREQ (8, 0) +/* GCC warns about strncat truncating output; this is deliberately + tested here. If fortify is enabled, it is also triggered by the + wrappers. */ +DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-truncation"); +#endif #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <libc-diag.h> char d[3] = "\0\1\2"; @@ -11,11 +18,6 @@ int main (void) { DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (8, 0) - /* GCC 8 warns about strncat truncating output; this is deliberately - tested here. */ - DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-truncation"); -#endif strncat (d, "\5\6", 1); DIAG_POP_NEEDS_COMMENT; if (d[0] != '\5')
reply other threads:[~2023-07-24 18:54 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230724185449.4750D3858D32@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).