summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-05-02 08:16:34 +0000
committerUlrich Drepper <drepper@redhat.com>2007-05-02 08:16:34 +0000
commit57433edee3c08b16967487664a28e0ecc99d7f8c (patch)
tree5d766087a3661884bfc01b93dc8c7f44ab645ad7
parent1cb04337f2f373b5ebc6a83d254add05f850ebe1 (diff)
* stdio-common/vfprintf.c (process_string_arg): Use a VLA rather than
fixed length array for ignore.
-rw-r--r--ChangeLog5
-rw-r--r--stdio-common/vfprintf.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d558dede4e..6529087655 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-02 Jakub Jelinek <jakub@redhat.com>
+
+ * stdio-common/vfprintf.c (process_string_arg): Use a VLA rather than
+ fixed length array for ignore.
+
2007-04-30 Ulrich Drepper <drepper@redhat.com>
[BZ #4438]
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 31bc523025..20c07ce73a 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1162,7 +1162,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
/* 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. */\
- wchar_t ignore[1024]; \
+ 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) \