system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
failure.
This commit is contained in:
Ulrich Drepper 2006-08-26 21:41:37 +00:00
parent d678ebc16b
commit 7166374764
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2006-08-24 Ulrich Drepper <drepper@redhat.com>
* locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don't * locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don't

5
locale/programs/ld-ctype.c
View File

@ -2245,6 +2245,9 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
if (locfile_read (copy_locale, charmap) != 0) if (locfile_read (copy_locale, charmap) != 0)
goto skip_category; goto skip_category;
} }
if (copy_locale->categories[LC_CTYPE].ctype == NULL)
return;
} }
lr_ignore_rest (ldfile, 1); lr_ignore_rest (ldfile, 1);
@ -2256,8 +2259,6 @@ ctype_read (struct linereader *ldfile, struct localedef_t *result,
/* Prepare the data structures. */ /* Prepare the data structures. */
ctype_startup (ldfile, result, charmap, copy_locale, ignore_content); ctype_startup (ldfile, result, charmap, copy_locale, ignore_content);
ctype = result->categories[LC_CTYPE].ctype; ctype = result->categories[LC_CTYPE].ctype;
if (ctype == NULL)
return;
/* Remember the repertoire we use. */ /* Remember the repertoire we use. */
if (!ignore_content) if (!ignore_content)