Author: madcoder
Date: 2007-05-04 09:27:18 +0000 (Fri, 04 May 2007)
New Revision: 2174

Modified:
   glibc-package/trunk/debian/patches/any/cvs-vfprintf-stack-smashing.diff
   glibc-package/trunk/debian/patches/series
Log:
fix call to __mbsnrtowcs using ignore_size and not hardcoded 1024. That
should be reported upstream somwhoe.

Signed-off-by: Pierre Habouzit <[EMAIL PROTECTED]>


Modified: 
glibc-package/trunk/debian/patches/any/cvs-vfprintf-stack-smashing.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-vfprintf-stack-smashing.diff     
2007-05-03 23:45:47 UTC (rev 2173)
+++ glibc-package/trunk/debian/patches/any/cvs-vfprintf-stack-smashing.diff     
2007-05-04 09:27:18 UTC (rev 2174)
@@ -13,10 +13,11 @@
 RCS file: /cvs/glibc/libc/stdio-common/vfprintf.c,v
 retrieving revision 1.135
 retrieving revision 1.137
-diff -u -r1.135 -r1.137
---- libc/stdio-common/vfprintf.c       2007/03/17 17:08:56     1.135
-+++ libc/stdio-common/vfprintf.c       2007/05/02 08:15:50     1.137
-@@ -1160,19 +1160,26 @@
+Index: glibc-2.5/stdio-common/vfprintf.c
+===================================================================
+--- glibc-2.5.orig/stdio-common/vfprintf.c     2006-05-02 22:25:15.000000000 
+0200
++++ glibc-2.5/stdio-common/vfprintf.c  2007-05-04 11:26:16.049828248 +0200
+@@ -1159,19 +1159,26 @@
                else                                                          \
                  {                                                           \
                    /* In case we have a multibyte character set the          \
@@ -42,8 +43,8 @@
 -                    }                                                       \
 +                                                                            \
 +                  while (str2 != NULL && str2 < strend)                     \
-+                    if (__mbsnrtowcs (ignore, &str2, strend - str2, 1024,   \
-+                                      &ps) == (size_t) -1)                  \
++                    if (__mbsnrtowcs (ignore, &str2, strend - str2,         \
++                                      ignore_size, &ps) == (size_t) -1)     \
 +                      {                                                     \
 +                        done = -1;                                          \
 +                        goto all_done;                                      \

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2007-05-03 23:45:47 UTC (rev 
2173)
+++ glibc-package/trunk/debian/patches/series   2007-05-04 09:27:18 UTC (rev 
2174)
@@ -109,7 +109,7 @@
 any/cvs-itoa-c.diff -p1
 any/cvs-lt-update.diff -p0
 any/cvs-realpath.diff -p1
-any/cvs-vfprintf-stack-smashing.diff -p1
+any/cvs-vfprintf-stack-smashing.diff 
 any/cvs-zdump-64-bit.diff -p1
 any/local-notls.diff -p0
 any/local-asserth-decls.diff -p0


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to