aboutsummaryrefslogtreecommitdiff
path: root/locale/programs
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-26 21:41:37 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-26 21:41:37 +0000
commit7166374764ceb7eb568c63e736f099b812f29a54 (patch)
tree1ff6aaf473bde5313f1ff5195b7680a9ec934a24 /locale/programs
parentd678ebc16b240a0052e7d76263fd4cf32ae6bb7c (diff)
downloadglibc-7166374764ceb7eb568c63e736f099b812f29a54.tar
glibc-7166374764ceb7eb568c63e736f099b812f29a54.tar.gz
glibc-7166374764ceb7eb568c63e736f099b812f29a54.tar.bz2
glibc-7166374764ceb7eb568c63e736f099b812f29a54.zip
* locale/programs/ld-ctype.c (ctype_read): Better patch for read
failure.
Diffstat (limited to 'locale/programs')
-rw-r--r--locale/programs/ld-ctype.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index 0ffda62e29..a42b6f184d 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)