r2808 - in glibc-package/trunk/debian: . patches/alpha
Author: aurel32
Date: 2008-02-10 23:44:01 +0000 (Sun, 10 Feb 2008)
New Revision: 2808
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/alpha/local-dl-procinfo.diff
Log:
* patches/alpha/local-dl-procinfo.diff: fix _dl_string_platform() to accept
NULL pointers, which happens on statically linked binaries. Closes:
bug#456260.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-02-10 20:45:44 UTC (rev 2807)
+++ glibc-package/trunk/debian/changelog 2008-02-10 23:44:01 UTC (rev 2808)
@@ -33,8 +33,11 @@
#464395.
* rules.d/build.mk: build the locales in the build target instead of the
install one to workaround a bug in fakeroot. Closes: #464924.
+ * patches/alpha/local-dl-procinfo.diff: fix _dl_string_platform() to accept
+ NULL pointers, which happens on statically linked binaries. Closes:
+ bug#456260.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 10 Feb 2008 21:43:01 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 11 Feb 2008 00:42:32 +0100
glibc (2.7-6) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/alpha/local-dl-procinfo.diff
===================================================================
--- glibc-package/trunk/debian/patches/alpha/local-dl-procinfo.diff 2008-02-10 20:45:44 UTC (rev 2807)
+++ glibc-package/trunk/debian/patches/alpha/local-dl-procinfo.diff 2008-02-10 23:44:01 UTC (rev 2808)
@@ -1,6 +1,6 @@
--- /dev/null
+++ sysdeps/alpha/dl-procinfo.h
-@@ -0,0 +1,63 @@
+@@ -0,0 +1,68 @@
+/* Alpha version of processor capability information handling macros.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -43,9 +43,14 @@
+__attribute__ ((unused, always_inline))
+_dl_string_platform (const char *str)
+{
-+ for (int i = 0; i < _DL_PLATFORMS_COUNT; ++i)
-+ if (strcmp (str, _dl_platform_string (i)) == 0)
-+ return i;
++ int i;
++
++ if (str != NULL)
++ for (i = 0; i < _DL_PLATFORMS_COUNT; ++i)
++ {
++ if (strcmp (str, _dl_platform_string (i)) == 0)
++ return i;
++ }
+ return -1;
+};
+
Reply to: