diff options
| author | Jeff Law <law@redhat.com> | 2012-09-28 12:48:42 -0600 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2012-10-03 13:35:33 -0700 |
| commit | cbc43bc538c3f06281e53e1345c77e1227f1b7a7 (patch) | |
| tree | db92f752cc9901c2c251f9bf7afe63b80940daa1 | |
| parent | 6c62f10874ddbab671255ce85ec85233c67f8bfc (diff) | |
| download | glibc-cbc43bc538c3f06281e53e1345c77e1227f1b7a7.tar.gz glibc-cbc43bc538c3f06281e53e1345c77e1227f1b7a7.tar.xz glibc-cbc43bc538c3f06281e53e1345c77e1227f1b7a7.zip | |
Don't parse %s format argument as multibyte string
(cherry picked from commit 715a900c9085907fa749589bf738b192b1a2bda5) 2012-09-28 Andreas Schwab <schwab@linux-m68k.org> [BZ #6530] * stdio-common/vfprintf.c (process_string_arg): Revert 2000-07-22 change. 2011-09-28 Jonathan Nieder <jrnieder@gmail.com> * stdio-common/Makefile (tst-sprintf-ENV): Set environment for testcase. * stdio-common/tst-sprintf.c: Include <locale.h> (main): Test sprintf's handling of incomplete multibyte characters.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | stdio-common/Makefile | 1 | ||||
| -rw-r--r-- | stdio-common/tst-sprintf.c | 13 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 39 |
5 files changed, 32 insertions, 37 deletions
diff --git a/ChangeLog b/ChangeLog index cddc90e4bf..7c7230058c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2012-09-28 Andreas Schwab <schwab@linux-m68k.org> + + [BZ #6530] + * stdio-common/vfprintf.c (process_string_arg): Revert + 2000-07-22 change. + +2011-09-28 Jonathan Nieder <jrnieder@gmail.com> + + * stdio-common/Makefile (tst-sprintf-ENV): Set environment + for testcase. + * stdio-common/tst-sprintf.c: Include <locale.h> + (main): Test sprintf's handling of incomplete multibyte + characters. + 2012-09-25 Joseph Myers <joseph@codesourcery.com> [BZ #14621] diff --git a/NEWS b/NEWS index 48358b5124..50aec9ddc8 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ Version 2.16.1 * The following bugs are resolved with this release: - 14195, 14459, 14476, 14562, 14621 + 6530, 14195, 14459, 14476, 14562, 14621 Version 2.16 diff --git a/stdio-common/Makefile b/stdio-common/Makefile index a29924bc7c..42e45dc1c3 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -116,6 +116,7 @@ CFLAGS-scanf17.c = -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \ # We know the test has a format string problem. CFLAGS-tst-sprintf.c = -Wno-format +tst-sprintf-ENV = LOCPATH=$(common-objpfx)localedata tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata tst-swprintf-ENV = LOCPATH=$(common-objpfx)localedata test-vfprintf-ENV = LOCPATH=$(common-objpfx)localedata diff --git a/stdio-common/tst-sprintf.c b/stdio-common/tst-sprintf.c index c04fef18f4..c4e911fe94 100644 --- a/stdio-common/tst-sprintf.c +++ b/stdio-common/tst-sprintf.c @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <locale.h> #include <string.h> @@ -58,5 +59,17 @@ main (void) result = 1; } + if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL) + { + puts ("cannot set locale"); + result = 1; + } + else if (sprintf (buf, "%.8s\n", "Foo: \277") != 7 + || strcmp (buf, "Foo: \277\n") != 0) + { + printf ("sprintf (buf, \"%%.8s\\n\", \"Foo: \\277\") produced '%s' output\n", buf); + result = 1; + } + return result; } diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index d569034253..17d3f42a97 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -1168,42 +1168,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ if (prec != -1) \ - { \ - /* Search for the end of the string, but don't search past \ - the length (in bytes) specified by the precision. Also \ - don't use incomplete characters. */ \ - if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX) == 1) \ - len = __strnlen (string, prec); \ - else \ - { \ - /* In case we have a multibyte character set the \ - situation is more complicated. We must not copy \ - bytes at the end which form an incomplete character. */\ - size_t ignore_size = (unsigned) prec > 1024 ? 1024 : prec;\ - wchar_t ignore[ignore_size]; \ - const char *str2 = string; \ - const char *strend = string + prec; \ - if (strend < string) \ - strend = (const char *) UINTPTR_MAX; \ - \ - mbstate_t ps; \ - memset (&ps, '\0', sizeof (ps)); \ - \ - while (str2 != NULL && str2 < strend) \ - if (__mbsnrtowcs (ignore, &str2, strend - str2, \ - ignore_size, &ps) == (size_t) -1) \ - { \ - /* Conversion function has set errno. */ \ - done = -1; \ - goto all_done; \ - } \ - \ - if (str2 == NULL) \ - len = strlen (string); \ - else \ - len = str2 - string - (ps.__count & 7); \ - } \ - } \ + /* Search for the end of the string, but don't search past \ + the length (in bytes) specified by the precision. */ \ + len = __strnlen (string, prec); \ else \ len = strlen (string); \ } \ |