diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | NEWS | 14 | ||||
| -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, 38 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog index f90d0fee12..0f1eb180af 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-28 H.J. Lu <hongjiu.lu@intel.com> * elf/dl-runtime.c (VERSYMIDX): Removed. diff --git a/NEWS b/NEWS index 7b3f6314fb..0567c9e707 100644 --- a/NEWS +++ b/NEWS @@ -9,13 +9,13 @@ Version 2.17 * The following bugs are resolved with this release: - 1349, 3479, 5044, 5298, 5400, 6778, 6808, 9685, 9914, 10014, 10038, - 11438, 11607, 13412, 13542, 13629, 13679, 13696, 13717, 13741, 13939, - 13966, 14042, 14090, 14150, 14151, 14154, 14157, 14166, 14173, 14195, - 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, 14337, - 14347, 14349, 14376, 14459, 14476, 14505, 14510, 14516, 14518, 14519, - 14530, 14532, 14538, 14543, 14544, 14545, 14562, 14576, 14579, 14583, - 14587, 14621. + 1349, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014, + 10038, 11438, 11607, 13412, 13542, 13629, 13679, 13696, 13717, 13741, + 13939, 13966, 14042, 14090, 14150, 14151, 14154, 14157, 14166, 14173, + 14195, 14237, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336, + 14337, 14347, 14349, 14376, 14459, 14476, 14505, 14510, 14516, 14518, + 14519, 14530, 14532, 14538, 14543, 14544, 14545, 14562, 14576, 14579, + 14583, 14587, 14621. * Support for STT_GNU_IFUNC symbols added for s390 and s390x. Optimized versions of memcpy, memset, and memcmp added for System z10 and diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 0cdf6307ea..5e2e48dfc2 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); \ } \ |