r2144 - in glibc-package/trunk/debian: . patches patches/any
Author: madcoder
Date: 2007-04-27 22:54:32 +0000 (Fri, 27 Apr 2007)
New Revision: 2144
Added:
glibc-package/trunk/debian/patches/any/cvs-scanf_hexfloat.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
patches/any/cvs-scanf_hexfloat.diff: Closes: #166403.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-27 13:59:16 UTC (rev 2143)
+++ glibc-package/trunk/debian/changelog 2007-04-27 22:54:32 UTC (rev 2144)
@@ -40,11 +40,13 @@
gracefuly. Closes: #338507.
+ also invalidate hosts on reload.
+ drop oldies (nscd_nischeck things, does not exists anymore).
+ * patches/any/cvs-scanf_hexfloat.diff: fix a bug when parsing a float in
+ hexadicimal form with no exponent. Closes: #166403.
[ Clint Adams ]
* Switch from linux-kernel-headers to linux-libc-dev.
- -- Clint Adams <schizo@debian.org> Fri, 27 Apr 2007 07:30:12 -0400
+ -- Pierre Habouzit <madcoder@debian.org> Sat, 28 Apr 2007 00:53:01 +0200
glibc (2.5-4) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/cvs-scanf_hexfloat.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-scanf_hexfloat.diff 2007-04-27 13:59:16 UTC (rev 2143)
+++ glibc-package/trunk/debian/patches/any/cvs-scanf_hexfloat.diff 2007-04-27 22:54:32 UTC (rev 2144)
@@ -0,0 +1,35 @@
+Index: glibc-2.5/stdio-common/tstscanf.c
+===================================================================
+--- glibc-2.5.orig/stdio-common/tstscanf.c
++++ glibc-2.5/stdio-common/tstscanf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991,92,96,97,98,99,2000,2001 Free Software Foundation, Inc.
++/* Copyright (C) 1991,92,1996-2001,2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -272,7 +272,7 @@
+ res = sscanf ("0x1234", "%lf", &d);
+ printf ("res = %d, d = %f\n", res, d);
+
+- if (res != 0 || d != 123456.789)
++ if (res != 1 || d != 4660)
+ {
+ fputs ("test failed!\n", stdout);
+ result = 1;
+Index: glibc-2.5/stdio-common/vfscanf.c
+===================================================================
+--- glibc-2.5.orig/stdio-common/vfscanf.c
++++ glibc-2.5/stdio-common/vfscanf.c
+@@ -1888,9 +1888,9 @@
+
+ /* Have we read any character? If we try to read a number
+ in hexadecimal notation and we have read only the `0x'
+- prefix or no exponent this is an error. */
++ prefix this is an error. */
+ if (__builtin_expect (wpsize == 0
+- || (is_hexa && (wpsize == 2 || ! got_e)), 0))
++ || (is_hexa && wpsize == 2), 0))
+ conv_error ();
+
+ scan_float:
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-04-27 13:59:16 UTC (rev 2143)
+++ glibc-package/trunk/debian/patches/series 2007-04-27 22:54:32 UTC (rev 2144)
@@ -148,3 +148,4 @@
any/submitted-strfry.diff -p0
any/submitted-unistd_XOPEN_VERSION.diff
any/cvs-glob-c.diff
+any/cvs-scanf_hexfloat.diff
Reply to: