[PATCH] Add test for bug 29530

[PATCH] Add test for bug 29530

[Andreas Schwab]

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).").
---
 stdio-common/Makefile        |  2 ++
 stdio-common/tst-grouping2.c | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 stdio-common/tst-grouping2.c

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index b1e9144de0..e11aaedd96 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -174,6 +174,7 @@ tests := \
   tst-fwrite \
   tst-gets \
   tst-grouping \
+  tst-grouping2 \
   tst-long-dbl-fphex \
   tst-memstream-string \
   tst-obprintf \
@@ -295,6 +296,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..2eff649073
--- /dev/null
+++ b/stdio-common/tst-grouping2.c
@@ -0,0 +1,36 @@
+/* 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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <locale.h>
+#include <stdio.h>
+#include <support/support.h>
+
+static int
+do_test (void)
+{
+  char buf[1001];
+
+  xsetlocale (LC_NUMERIC, "de_DE.UTF-8");
+
+  /* This used to crash in group_number.  */
+  sprintf (buf, "%'1000d", 1000);
+
+  return 0;
+}
+
+#include <support/test-driver.c>
-- 
2.37.2


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: [PATCH] Add test for bug 29530

[Florian Weimer]

* Andreas Schwab via Libc-alpha:

> +static int
> +do_test (void)
> +{
> +  char buf[1001];
> +
> +  xsetlocale (LC_NUMERIC, "de_DE.UTF-8");
> +
> +  /* This used to crash in group_number.  */
> +  sprintf (buf, "%'1000d", 1000);
> +
> +  return 0;
> +}

Should the test check the expected output?

Thanks,
Florian

Re: [PATCH] Add test for bug 29530

[Andreas Schwab]

On Aug 29 2022, Florian Weimer wrote:

> * Andreas Schwab via Libc-alpha:
>
>> +static int
>> +do_test (void)
>> +{
>> +  char buf[1001];
>> +
>> +  xsetlocale (LC_NUMERIC, "de_DE.UTF-8");
>> +
>> +  /* This used to crash in group_number.  */
>> +  sprintf (buf, "%'1000d", 1000);
>> +
>> +  return 0;
>> +}
>
> Should the test check the expected output?

It could, but that's not the point of it.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

[PATCH] Add test for bug 29530

[Andreas Schwab]

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).").
---
 stdio-common/Makefile        |  2 ++
 stdio-common/tst-grouping2.c | 39 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 stdio-common/tst-grouping2.c

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index b1e9144de0..e11aaedd96 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -174,6 +174,7 @@ tests := \
   tst-fwrite \
   tst-gets \
   tst-grouping \
+  tst-grouping2 \
   tst-long-dbl-fphex \
   tst-memstream-string \
   tst-obprintf \
@@ -295,6 +296,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
+   <https://www.gnu.org/licenses/>.  */
+
+#include <locale.h>
+#include <stdio.h>
+#include <support/check.h>
+#include <support/support.h>
+
+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 <support/test-driver.c>
-- 
2.37.2


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: [PATCH] Add test for bug 29530

[Florian Weimer]

* Andreas Schwab:

> 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).").
> ---
>  stdio-common/Makefile        |  2 ++
>  stdio-common/tst-grouping2.c | 39 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 41 insertions(+)
>  create mode 100644 stdio-common/tst-grouping2.c

Okay, thanks.

Florian