diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-27 13:33:26 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-10-27 13:33:26 +0100 |
| commit | 0062ace2292effc4135c15ea99b1931fea5e0203 (patch) | |
| tree | e82fad1911341d86bf5646f1f6418d7e80e39fd1 | |
| parent | 7a4cb4ad1130e43e1256f85cea38a3227320f944 (diff) | |
Gracefully handle incompatible locale data
* locale/loadlocale.c (_nl_intern_locale_data): Change assertion
on CNT to a conditional jump to 'puntdata'.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | locale/loadlocale.c | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -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-10-27 Joseph Myers <joseph@codesourcery.com> * configure.ac (libc_cv_gcc___thread): Remove configure test. diff --git a/locale/loadlocale.c b/locale/loadlocale.c index fdba6e93c4..dcbb833a16 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); |