* locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don't

	do anything.

diff --git a/ChangeLog b/ChangeLog
index 483f5ac256649abf0784d1e4bd7f5e2a0b563d67..b95ea69c5e8e2bfa37cd8166258a7416018c6192 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-24  Ulrich Drepper  <drepper@redhat.com>
 
+       * locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don't
+       do anything.
+
        * sysdeps/generic/ldsodefs.h (DL_ADDR_SYM_MATCH): For undefined
        symbol require exact match (these are PLTs).
        * sysdeps/unix/sysv/linux/powerpc/powerpc64/ldsodefs.h

diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index f38231f984b9e09f06406189c22a02b22c17fd28..0ffda62e2977ad72e6b3fd9cd99e986d3188ccb9 100644 (file)
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -2256,6 +2256,8 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
   /* Prepare the data structures.  */
   ctype_startup (ldfile, result, charmap, copy_locale, ignore_content);
   ctype = result->categories[LC_CTYPE].ctype;
+  if (ctype == NULL)
+    return;
 
   /* Remember the repertoire we use.  */
   if (!ignore_content)