r5852 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/any
Author: aurel32
Date: 2013-12-03 10:22:12 +0000 (Tue, 03 Dec 2013)
New Revision: 5852
Added:
glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-findlocale-div-by-zero.diff
Removed:
glibc-package/branches/eglibc-2.18/debian/patches/any/submitted-findlocale-div-by-zero.diff
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/series
Log:
Replace patches/any/submitted-findlocale-div-by-zero.diff by upstream
version patches/any/cvs-findlocale-div-by-zero.diff.
(and fix a merge issue at the same time)
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-02 20:56:17 UTC (rev 5851)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-12-03 10:22:12 UTC (rev 5852)
@@ -177,6 +177,8 @@
doesn't now about kfreebsd specific headers.
* debian/rules: don't pass -fstrict-aliasing to HOST_CFLAGS, it is already
included in -O2.
+ * Replace patches/any/submitted-findlocale-div-by-zero.diff by upstream
+ version patches/any/cvs-findlocale-div-by-zero.diff.
-- Adam Conrad <adconrad@ubuntu.com> Sat, 09 Nov 2013 12:48:20 +0100
Added: glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-findlocale-div-by-zero.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-findlocale-div-by-zero.diff (rev 0)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/cvs-findlocale-div-by-zero.diff 2013-12-03 10:22:12 UTC (rev 5852)
@@ -0,0 +1,33 @@
+commit 18d1425127e5712dda888bb280d5d1a038a45c7f
+Author: Aurelien Jarno <aurelien@aurel32.net>
+Date: Tue Dec 3 11:16:16 2013 +0100
+
+ locale: don't crash if locale-archive contains all zeros
+
+ In case of power failure followed by filesystem issues locale-archive
+ can end-up containing all zeros. In that case all calls to setlocale()
+ generate a SIGFPE. This renders a system with a default non-C locale
+ unbootable.
+
+ Avoid this by ignoring the locale instead of generating a SIGFPE.
+
+2013-12-03 Aurelien Jarno <aurelien@aurel32.net>
+
+ * locale/loadarchive.c (_nl_load_locale_from_archive): Avoid
+ division by 0.
+
+diff --git a/locale/loadarchive.c b/locale/loadarchive.c
+index 70136dc..f723780 100644
+--- a/locale/loadarchive.c
++++ b/locale/loadarchive.c
+@@ -274,6 +274,10 @@ _nl_load_locale_from_archive (int category, const char **namep)
+ namehashtab = (struct namehashent *) ((char *) head
+ + head->namehash_offset);
+
++ /* Avoid division by 0 if the file is corrupted. */
++ if (__glibc_unlikely (head->namehash_size == 0))
++ goto close_and_out;
++
+ idx = hval % head->namehash_size;
+ incr = 1 + hval % (head->namehash_size - 2);
+
Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/submitted-findlocale-div-by-zero.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/submitted-findlocale-div-by-zero.diff 2013-12-02 20:56:17 UTC (rev 5851)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/submitted-findlocale-div-by-zero.diff 2013-12-03 10:22:12 UTC (rev 5852)
@@ -1,33 +0,0 @@
-From 437065b1f485c84051c5ff9a027edb03bdfec61c Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Fri, 29 Nov 2013 16:28:17 +0100
-Subject: [PATCH] locale: don't crash if locale-archive is an empty file
-
-In case of power failure followed by filesystem issues locale-archive
-can end-up containing all zeros. In that case all calls to setlocale()
-generate a SIGFPE. This renders a system with a default non-C locale
-unbootable.
-
-Avoid this by ignoring the locale instead of generating a SIGFPE.
----
- locale/loadarchive.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/locale/loadarchive.c b/locale/loadarchive.c
-index 70136dc..7cfc498 100644
---- a/locale/loadarchive.c
-+++ b/locale/loadarchive.c
-@@ -274,6 +274,10 @@ _nl_load_locale_from_archive (int category, const char **namep)
- namehashtab = (struct namehashent *) ((char *) head
- + head->namehash_offset);
-
-+ /* Avoid division by 0 if the file is corrupted. */
-+ if (__builtin_expect (head->namehash_size == 0, 0))
-+ goto close_and_out;
-+
- idx = hval % head->namehash_size;
- incr = 1 + hval % (head->namehash_size - 2);
-
---
-1.8.4.2
-
Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series 2013-12-02 20:56:17 UTC (rev 5851)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series 2013-12-03 10:22:12 UTC (rev 5852)
@@ -252,6 +252,7 @@
any/cvs-CVE-2013-4788-static-ptrguard-ppc64.diff
any/cvs-CVE-2013-4788-static-ptrguard-arm.diff
any/unsubmitted-dlopen-static-crash.diff
+any/cvs-findlocale-div-by-zero.diff
any/unsubmitted-tst-tlsmod-as-needed.diff
any/unsubmitted-scanf-includes.diff
any/cvs-strcasecmp-locales.diff
Reply to: