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

r2151 - in glibc-package/trunk/debian: . patches patches/any



Author: madcoder
Date: 2007-04-30 12:46:40 +0000 (Mon, 30 Apr 2007)
New Revision: 2151

Added:
   glibc-package/trunk/debian/patches/any/submitted-vfprintf-stack-smashing.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
push the fix for the vfprintf bug.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2007-04-30 12:35:53 UTC (rev 2150)
+++ glibc-package/trunk/debian/changelog	2007-04-30 12:46:40 UTC (rev 2151)
@@ -50,11 +50,14 @@
      + patches/any/local-disable-nscd-host-caching.diff: update nscd.conf.
   * build the glibc with -ggdb3 rather than -g so that debug symbols in
     libc6-dbg also helps in macros debugging.
+  * patches/any/submitted-vfprintf-stack-smashing.diff: enormous alloca
+    triggered with %-X.Ys like formats specifier, with Y big, and in
+    multi-byte locales. Closes: #380195, #421555.
 
   [ Clint Adams ]
   * Switch from linux-kernel-headers to linux-libc-dev | linux-kernel-headers.
 
- -- Pierre Habouzit <madcoder@debian.org>  Mon, 30 Apr 2007 14:33:23 +0200
+ -- Pierre Habouzit <madcoder@debian.org>  Mon, 30 Apr 2007 14:42:07 +0200
 
 glibc (2.5-4) unstable; urgency=low
 

Added: glibc-package/trunk/debian/patches/any/submitted-vfprintf-stack-smashing.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-vfprintf-stack-smashing.diff	2007-04-30 12:35:53 UTC (rev 2150)
+++ glibc-package/trunk/debian/patches/any/submitted-vfprintf-stack-smashing.diff	2007-04-30 12:46:40 UTC (rev 2151)
@@ -0,0 +1,18 @@
+Index: glibc-2.5/stdio-common/vfprintf.c
+===================================================================
+--- glibc-2.5.orig/stdio-common/vfprintf.c
++++ glibc-2.5/stdio-common/vfprintf.c
+@@ -1161,12 +1161,11 @@
+ 		    /* In case we have a multibyte character set the	      \
+ 		       situation is more compilcated.  We must not copy	      \
+ 		       bytes at the end which form an incomplete character. */\
+-		    wchar_t ignore[prec];				      \
+ 		    const char *str2 = string;				      \
+ 		    mbstate_t ps;					      \
+ 									      \
+ 		    memset (&ps, '\0', sizeof (ps));			      \
+-		    if (__mbsnrtowcs (ignore, &str2, prec, prec, &ps)	      \
++		    if (__mbsnrtowcs (NULL, &str2, prec, prec, &ps)	      \
+ 			== (size_t) -1)					      \
+ 		      {							      \
+ 			done = -1;					      \

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2007-04-30 12:35:53 UTC (rev 2150)
+++ glibc-package/trunk/debian/patches/series	2007-04-30 12:46:40 UTC (rev 2151)
@@ -150,3 +150,4 @@
 any/cvs-glob-c.diff
 any/cvs-scanf_hexfloat.diff
 any/local-disable-nscd-host-caching.diff
+any/submitted-vfprintf-stack-smashing.diff



Reply to: