[PATCH] Robustify localedef

[PATCH] Robustify localedef

[Jakub Jelinek]

Hi!

cd /etc/sysconfig
localedef hu_HU.iso88592 -i hu_HU -f iso88592

segfaults after printing a bunch of various errors (errors are ok and
expected, but the segfault is not).
/etc/sysconfig is just a random directory that contains for localedef
bogus i18n source:
LANG="en_US.UTF-8"
SYSFONT="latarcyrheb-sun16"
and in addition to this user error there is also invalid charmap name.
With this, localedef calls find_translit eventhough there is
locale->categories[LC_CTYPE].ctype == NULL (locale->avail has CTYPE_LOCALE
bit set only because locfile_read ors it at the end with not_here).
When locale->categories[LC_CTYPE].ctype == NULL, we know localedef will warn
and set LC_CTYPE category to a default, which certainly has both
translit and translit_include set to NULL, so IMHO returning NULL from
find_translit in this case right away is the right thing to do.

2007-03-15  Jakub Jelinek  <jakub@redhat.com>

	* locale/programs/ld-ctype.c (find_translit): Return NULL if ctype is
	NULL.

--- libc/locale/programs/ld-ctype.c.jj	2006-11-16 17:38:02.000000000 +0100
+++ libc/locale/programs/ld-ctype.c	2007-03-15 22:46:37.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1995.
 
@@ -1866,6 +1866,9 @@ find_translit (struct localedef_t *local
   assert (locale != NULL);
   ctype = locale->categories[LC_CTYPE].ctype;
 
+  if (ctype == NULL)
+    return NULL;
+
   if (ctype->translit != NULL)
     result = find_translit2 (ctype, charmap, wch);
 

	Jakub