diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-09-05 22:16:58 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-09-05 22:16:58 +0200 |
| commit | de18a7061c9bdff73d66502c55d6a3ea671fc6d9 (patch) | |
| tree | d3d4d3a27d9ac4aea5fc088a884cc2ec5f256ce7 /locale/setlocale.c | |
| parent | ab41100bab128fa98258aafbb0ab1622884cec4c (diff) | |
| download | glibc-de18a7061c9bdff73d66502c55d6a3ea671fc6d9.tar glibc-de18a7061c9bdff73d66502c55d6a3ea671fc6d9.tar.gz glibc-de18a7061c9bdff73d66502c55d6a3ea671fc6d9.tar.bz2 glibc-de18a7061c9bdff73d66502c55d6a3ea671fc6d9.zip | |
locale: Avoid zero-length array in _nl_category_names [BZ #24962]
The union wrapper is unnecessary because C allows to read any object
as a sequence of chars.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'locale/setlocale.c')
| -rw-r--r-- | locale/setlocale.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c index 9bd35454b9..264a1ecba7 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -65,20 +65,18 @@ static char *const _nl_current_used[] = /* Define an array of category names (also the environment variable names). */ -const union catnamestr_t _nl_category_names attribute_hidden = +const struct catnamestr_t _nl_category_names attribute_hidden = { - { #define DEFINE_CATEGORY(category, category_name, items, a) \ - category_name, + category_name, #include "categories.def" #undef DEFINE_CATEGORY - } }; const uint8_t _nl_category_name_idxs[__LC_LAST] attribute_hidden = { #define DEFINE_CATEGORY(category, category_name, items, a) \ - [category] = offsetof (union catnamestr_t, CATNAMEMF (__LINE__)), + [category] = offsetof (struct catnamestr_t, CATNAMEMF (__LINE__)), #include "categories.def" #undef DEFINE_CATEGORY }; @@ -180,7 +178,7 @@ new_composite_name (int category, const char *newnames[__LC_LAST]) const char *name = (category == LC_ALL ? newnames[i] : category == i ? newnames[0] : _nl_global_locale.__names[i]); - p = __stpcpy (p, _nl_category_names.str + _nl_category_name_idxs[i]); + p = __stpcpy (p, _nl_category_names_get (i)); *p++ = '='; p = __stpcpy (p, name); *p++ = ';'; @@ -298,8 +296,7 @@ setlocale (int category, const char *locale) for (cnt = 0; cnt < __LC_LAST; ++cnt) if (cnt != LC_ALL && (size_t) (cp - np) == _nl_category_name_sizes[cnt] - && (memcmp (np, (_nl_category_names.str - + _nl_category_name_idxs[cnt]), cp - np) + && (memcmp (np, (_nl_category_names_get (cnt)), cp - np) == 0)) break; |