[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[commits] r2147 - in /fsf/trunk/libc: ChangeLog stdio-common/vfprintf.c



Author: eglibc
Date: Thu May  3 00:01:18 2007
New Revision: 2147

Log:
Import glibc-mainline for 2007-05-03

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/stdio-common/vfprintf.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu May  3 00:01:18 2007
@@ -1,3 +1,8 @@
+2007-05-02  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* stdio-common/vfprintf.c (process_string_arg): Use a VLA rather than
+	fixed length array for ignore.
+
 2007-04-30  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #4438]

Modified: fsf/trunk/libc/stdio-common/vfprintf.c
==============================================================================
--- fsf/trunk/libc/stdio-common/vfprintf.c (original)
+++ fsf/trunk/libc/stdio-common/vfprintf.c Thu May  3 00:01:18 2007
@@ -1162,7 +1162,8 @@
 		    /* 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)				      \