From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 79B163AA8885; Tue, 30 Aug 2022 08:45:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 79B163AA8885 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1661849128; bh=bop8PYBlYAWV9Vk4onO9stqDjA+jtPX0Y8XjYa5EoYA=; h=From:To:Subject:Date:From; b=gWuWU4Yc/TdYYMZynvT/XPBjc3kt+Gog744Qovx/5lhU/3mCiDZa3Q4zofq+fagMD 0BGlwY74+Di0ZXmwZxxZ8ssBHSXKzS8GRjFRNf5T+ZUSWyo8lQYCU3P0MTOJeYMBaq c6V1vcI8mUqWohzxySe0monsqH8HdIftq2FSK0eg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.30/master] Add test for bug 29530 X-Act-Checkin: glibc X-Git-Author: Andreas Schwab X-Git-Refname: refs/heads/release/2.30/master X-Git-Oldrev: f7a037e24997d140befe61857a15f980746be7b4 X-Git-Newrev: d0aac8b4833c725d0682108066a210bbb7cf3bf4 Message-Id: <20220830084528.79B163AA8885@sourceware.org> Date: Tue, 30 Aug 2022 08:45:28 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d0aac8b4833c725d0682108066a210bbb7cf3bf4 commit d0aac8b4833c725d0682108066a210bbb7cf3bf4 Author: Andreas Schwab Date: Mon Aug 29 15:05:40 2022 +0200 Add test for bug 29530 This tests for a bug that was introduced in commit edc1686af0 ("vfprintf: Reuse work_buffer in group_number") and fixed as a side effect of commit 6caddd34bd ("Remove most vfprintf width/precision-dependent allocations (bug 14231, bug 26211)."). (cherry picked from commit ca6466e8be32369a658035d69542d47603e58a99) Diff: --- stdio-common/Makefile | 5 ++++- stdio-common/tst-grouping2.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/stdio-common/Makefile b/stdio-common/Makefile index ace19a8388..9aaf2ec051 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -67,7 +67,9 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \ tst-renameat2 tst-bz11319 tst-bz11319-fortify2 \ scanf14a scanf16a \ tst-printf-bz25691 \ - tst-vfprintf-width-prec-alloc + tst-vfprintf-width-prec-alloc \ + tst-grouping2 \ + # tests test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble @@ -95,6 +97,7 @@ $(objpfx)bug14.out: $(gen-locales) $(objpfx)scanf13.out: $(gen-locales) $(objpfx)test-vfprintf.out: $(gen-locales) $(objpfx)tst-grouping.out: $(gen-locales) +$(objpfx)tst-grouping2.out: $(gen-locales) $(objpfx)tst-sprintf.out: $(gen-locales) $(objpfx)tst-sscanf.out: $(gen-locales) $(objpfx)tst-swprintf.out: $(gen-locales) diff --git a/stdio-common/tst-grouping2.c b/stdio-common/tst-grouping2.c new file mode 100644 index 0000000000..3024c942a6 --- /dev/null +++ b/stdio-common/tst-grouping2.c @@ -0,0 +1,39 @@ +/* Test printf with grouping and large width (bug 29530) + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include + +static int +do_test (void) +{ + const int field_width = 1000; + char buf[field_width + 1]; + + xsetlocale (LC_NUMERIC, "de_DE.UTF-8"); + + /* This used to crash in group_number. */ + TEST_COMPARE (sprintf (buf, "%'*d", field_width, 1000), field_width); + TEST_COMPARE_STRING (buf + field_width - 6, " 1.000"); + + return 0; +} + +#include