This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH v2] localedef: check LC_IDENTIFICATION.category values
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Cc: keld at keldix dot com
- Date: Thu, 14 Apr 2016 17:21:02 -0400
- Subject: [PATCH v2] localedef: check LC_IDENTIFICATION.category values
- Authentication-results: sourceware.org; auth=none
- References: <1460587532-5278-1-git-send-email-vapier at gentoo dot org>
Currently localedef accepts any value for the category keyword. This has
allowed bad values to propagate to the vast majority of locales (~90%).
Add some logic to only accept a few standards.
2016-04-13 Mike Frysinger <vapier@gentoo.org>
* locale/programs/ld-identification.c (identification_finish): Check
that the values in identification->category are only known.
---
v2:
- tweak list of accepted standards
locale/programs/ld-identification.c | 43 +++++++++++++++++++++++++++++++------
1 file changed, 36 insertions(+), 7 deletions(-)
diff --git a/locale/programs/ld-identification.c b/locale/programs/ld-identification.c
index 1e8fa84..9234304 100644
--- a/locale/programs/ld-identification.c
+++ b/locale/programs/ld-identification.c
@@ -164,14 +164,43 @@ No definition for %s category found"), "LC_IDENTIFICATION"));
TEST_ELEM (date);
for (num = 0; num < __LC_LAST; ++num)
- if (num != LC_ALL && identification->category[num] == NULL)
- {
- if (verbose && ! nothing)
- WITH_CUR_LOCALE (error (0, 0, _("\
+ {
+ /* We don't accept/parse this category, so skip it early. */
+ if (num == LC_ALL)
+ continue;
+
+ if (identification->category[num] == NULL)
+ {
+ if (verbose && ! nothing)
+ WITH_CUR_LOCALE (error (0, 0, _("\
%s: no identification for category `%s'"),
- "LC_IDENTIFICATION", category_name[num]));
- identification->category[num] = "";
- }
+ "LC_IDENTIFICATION", category_name[num]));
+ identification->category[num] = "";
+ }
+ else
+ {
+ /* Only list the standards we care about. */
+ static const char * const standards[] =
+ {
+ "posix:1993",
+ "i18n:2004",
+ "i18n:2012",
+ };
+ size_t i;
+ bool matched = false;
+
+ for (i = 0; i < sizeof (standards) / sizeof (standards[0]); ++i)
+ if (strcmp (identification->category[num], standards[i]) == 0)
+ matched = true;
+
+ if (matched != true)
+ WITH_CUR_LOCALE (error (0, 0, _("\
+%s: unknown standard `%s' for category `%s'"),
+ "LC_IDENTIFICATION",
+ identification->category[num],
+ category_name[num]));
+ }
+ }
}
--
2.7.4