summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-25 00:39:53 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-25 00:39:53 +0000
commitf5a8277232519ae2ec0e0a212d2717a515c631ff (patch)
treef14b391b1f64d24ab56feb6b04748292ef961756
parent2ac9ca73009c3f4ad0039f24eff5d2db4be6b488 (diff)
* locale/programs/ld-ctype.c (ctype_read): If CTYPE is NULL, don'tcvs/fedora-glibc-20060825T0639
do anything.
-rw-r--r--ChangeLog3
-rw-r--r--locale/programs/ld-ctype.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 483f5ac256..b95ea69c5e 100644
--- 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 f38231f984..0ffda62e29 100644
--- 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)