From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 26 Aug 2006 21:41:37 +0000 (+0000)
Subject: * locale/programs/ld-ctype.c (ctype_read): Better patch for read
X-Git-Tag: cvs/fedora-glibc-20060828T1903~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7166374764ceb7eb568c63e736f099b812f29a54;p=thirdparty%2Fglibc.git

* locale/programs/ld-ctype.c (ctype_read): Better patch for read

	failure.
---

diff --git a/ChangeLog b/ChangeLog
index b95ea69c5e8..7680f124a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* locale/programs/ld-ctype.c (ctype_read): Better patch for read
+	failure.
+
 2006-08-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don't
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 0ffda62e297..a42b6f184d7 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -2245,6 +2245,9 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
 	      if (locfile_read (copy_locale, charmap) != 0)
 		goto skip_category;
 	    }
+
+	  if (copy_locale->categories[LC_CTYPE].ctype == NULL)
+	    return;
 	}
 
       lr_ignore_rest (ldfile, 1);
@@ -2256,8 +2259,6 @@ 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)