Re: [PATCH] Gracefully handle incompatible locale data

[Andreas Schwab]

address@hidden (Ludovic Courtès) writes:

> 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);

What about the other assertion?

Andreas.

-- 
Andreas Schwab, SUSE Labs, address@hidden
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."