From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 4750D3858D32; Mon, 24 Jul 2023 18:54:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4750D3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1690224889; bh=WccrXHIAFLWSmEVvdvJp9altV3CiMpZCLfcWVygmpKg=; h=From:To:Subject:Date:From; b=DNGSUcT8DDBTkQTLNuA4FK56p0p6vv9TvcJ5YrOqukWCncHeYxZV9d4yxSnSNsLkz PunNneijp3iNPvTZ5hzcBWOluK7JYkisOBtxwF1d5EYDppjKREbLp33tees9HoMvyH 8BcQd/yrHcupebkBbMS8MGELAWjr23GkK85yJj74= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] string: Fix bug-strncat1 with fortify enabled X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/master X-Git-Oldrev: 2d472b48610f6a298d28035b683ab13e9afac4cb X-Git-Newrev: 85ac7edcdf67010c223541936243427213ac87a6 Message-Id: <20230724185449.4750D3858D32@sourceware.org> Date: Mon, 24 Jul 2023 18:54:49 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=85ac7edcdf67010c223541936243427213ac87a6 commit 85ac7edcdf67010c223541936243427213ac87a6 Author: Adhemerval Zanella Netto 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 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 +#include +#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 #include #include -#include 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')