From a73a62562a198072ab417e28d4c0315a78c49cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org> Date: Tue, 27 Oct 2015 13:33:26 +0100 Subject: [PATCH 36/65] Gracefully handle incompatible locale data * locale/loadlocale.c (_nl_intern_locale_data): Change assertion on CNT to a conditional jump to 'puntdata'. (cherry picked from commit 0062ace2292effc4135c15ea99b1931fea5e0203) --- ChangeLog | 5 +++++ locale/loadlocale.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bde9e2..9740c89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-10-27 Ludovic Courtès <ludo@gnu.org> + + * locale/loadlocale.c (_nl_intern_locale_data): Change assertion + on CNT to a conditional jump to 'puntdata'. + 2015-08-18 Alan Modra <amodra@gmail.com> [BZ #18421] diff --git a/locale/loadlocale.c b/locale/loadlocale.c index fdba6e9..dcbb833 100644 --- a/locale/loadlocale.c +++ b/locale/loadlocale.c @@ -121,9 +121,10 @@ _nl_intern_locale_data (int category, const void *data, size_t datasize) switch (category) { #define CATTEST(cat) \ - case LC_##cat: \ - assert (cnt < (sizeof (_nl_value_type_LC_##cat) \ - / sizeof (_nl_value_type_LC_##cat[0]))); \ + case LC_##cat: \ + if (cnt >= (sizeof (_nl_value_type_LC_##cat) \ + / sizeof (_nl_value_type_LC_##cat[0]))) \ + goto puntdata; \ break CATTEST (NUMERIC); CATTEST (TIME); -- 2.7.4