This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Gracefully handle incompatible locale data
- From: ludo at gnu dot org (Ludovic CourtÃs)
- To: libc-alpha at sourceware dot org
- Cc: guix-devel at gnu dot org
- Date: Tue, 22 Sep 2015 17:27:55 +0200
- Subject: [PATCH] Gracefully handle incompatible locale data
- Authentication-results: sourceware.org; auth=none
With libc 2.22 people are starting to realize that libc does not
guarantee that it can load locale data built with another libc version,
but they learn it the hard way:
loadlocale.c:130: _nl_intern_locale_data: Assertion `cnt < (sizeof (_nl_value_type_LC_COLLATE) / sizeof (_nl_value_type_LC_COLLATE[0]))' failed.
This patch changes such conditions to return EINVAL instead of aborting.
WDYT?
Thanks,
Ludoâ.
2015-10-22 Ludovic CourtÃs <ludo@gnu.org>
* locale/loadlocale.c (_nl_intern_locale_data): Change assertion
on CNT to a conditional jump to 'puntdata'.
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index fdba6e9..e04e720 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -122,8 +122,9 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize)
{
#define CATTEST(cat) \
case LC_##cat: \
- assert (cnt < (sizeof (_nl_value_type_LC_##cat) \
- / sizeof (_nl_value_type_LC_##cat[0]))); \
+ if (cnt >= (sizeof (_nl_value_type_LC_##cat) \
+ / sizeof (_nl_value_type_LC_##cat[0]))) \
+ goto puntdata; \
break
CATTEST (NUMERIC);
CATTEST (TIME);