diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | locale/loadlocale.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 4ce7a9227c..29ec9125a2 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-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); |