From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 75E933857835; Wed, 11 Jan 2023 21:13:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 75E933857835 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673471590; bh=HV9aESxVGDDS+Vl9O7TuZvk2d7YjT7Sk8mImGg6pamQ=; h=From:To:Subject:Date:From; b=poBNwWrNC5c/PDKdmSalb4apEr2CjwM2OXfxDKiIDyVvinSTlSL761TMvCKdeuxwU H9K1YxtX22nbUiElmIXTOniFG2mvh2op+0VInuKOLcFtXagz7BlrBaUc2IZ9ZqQXOm uhSo4cZTCkcfFp69Y2YNqRdQUAl5Jmeh39T7OYOQ= 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] locale: Use correct buffer size for utf8_sequence_error [BZ #19444] X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 57f4a850c84a0545dec9aea4242241d2b19fa6af X-Git-Newrev: 0b3503e2e19602db9cda47915d19a26c00f59bb1 Message-Id: <20230111211310.75E933857835@sourceware.org> Date: Wed, 11 Jan 2023 21:13:10 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b3503e2e19602db9cda47915d19a26c00f59bb1 commit 0b3503e2e19602db9cda47915d19a26c00f59bb1 Author: Adhemerval Zanella Date: Thu Dec 29 09:57:59 2022 -0300 locale: Use correct buffer size for utf8_sequence_error [BZ #19444] The buffer used by snprintf might not be large enough for all possible inputs, as indicated by gcc with -O1: ../locale/programs/linereader.c: In function ‘utf8_sequence_error’: ../locale/programs/linereader.c:713:58: error: ‘%02x’ directive output may be truncated writing between 2 and 8 bytes into a region of size between 1 and 13 [-Werror=format-truncation=] 713 | snprintf (buf, sizeof (buf), "0x%02x 0x%02x 0x%02x 0x%02x", | ^~~~ ../locale/programs/linereader.c:713:34: note: directive argument in the range [0, 2147483647] 713 | snprintf (buf, sizeof (buf), "0x%02x 0x%02x 0x%02x 0x%02x", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../locale/programs/linereader.c:713:5: note: ‘snprintf’ output between 20 and 38 bytes into a destination of size 30 713 | snprintf (buf, sizeof (buf), "0x%02x 0x%02x 0x%02x 0x%02x", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 714 | ch1, ch2, ch3, ch4); | ~~~~~~~~~~~~~~~~~~~ Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Diff: --- locale/programs/linereader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/programs/linereader.c b/locale/programs/linereader.c index 17099af744..f8c49ac06f 100644 --- a/locale/programs/linereader.c +++ b/locale/programs/linereader.c @@ -701,7 +701,7 @@ static bool utf8_sequence_error (struct linereader *lr, uint8_t ch1, int ch2, int ch3, int ch4) { - char buf[30]; + char buf[38]; if (ch2 < 0) snprintf (buf, sizeof (buf), "0x%02x", ch1);