diff options
Diffstat (limited to 'locale/programs')
| -rw-r--r-- | locale/programs/ld-collate.c | 2 | ||||
| -rw-r--r-- | locale/programs/ld-ctype.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c index b9734c36dd..5accaabfea 100644 --- a/locale/programs/ld-collate.c +++ b/locale/programs/ld-collate.c @@ -812,6 +812,8 @@ Computing table size for collation information might take a while..."), lastp = firstp; while (lastp->next != NULL && wcscmp (name, lastp->name)) lastp = lastp->next; + if (lastp->ordering == NULL) + lastp = &collate->undefined; } weights = lastp->ordering; diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 2fbefd9395..3c0c8e870d 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -1458,5 +1458,5 @@ Computing table size for character classes might take a while..."), /* We need the name of the currently used 8-bit character set to make correct conversion between this 8-bit representation and the ISO 10646 character set used internally for wide characters. */ - ctype->codeset_name = charset->code_set_name; + ctype->codeset_name = charset->code_set_name ? : ""; } |