summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-07-12 15:03:54 +0000
committerJakub Jelinek <jakub@redhat.com>2007-07-12 15:03:54 +0000
commite64da3e7d9bbf00dda616b6dc43a9b89706dda90 (patch)
tree09fa9a9780761aa7a4a416da9fd0de4326a3d5c0
parent2451ca4c5fc4a2466597e1da62be39d11cda15ae (diff)
downloadglibc-e64da3e7d9bbf00dda616b6dc43a9b89706dda90.tar
glibc-e64da3e7d9bbf00dda616b6dc43a9b89706dda90.tar.gz
glibc-e64da3e7d9bbf00dda616b6dc43a9b89706dda90.tar.bz2
glibc-e64da3e7d9bbf00dda616b6dc43a9b89706dda90.zip
2007-03-15 Jakub Jelinek <jakub@redhat.com>
* locale/programs/ld-ctype.c (find_translit): Return NULL if ctype is NULL.
-rw-r--r--ChangeLog5
-rw-r--r--locale/programs/ld-ctype.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a963613aec..619cf5e3bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-03-15 Jakub Jelinek <jakub@redhat.com>
+ * locale/programs/ld-ctype.c (find_translit): Return NULL if ctype is
+ NULL.
+
+2007-03-15 Jakub Jelinek <jakub@redhat.com>
+
[BZ #4181]
* inet/inet6_opt.c (add_padding): Only insert padding if npad > 0.
(inet6_opt_append): Don't check extlen is big enough if extbuf
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c
index ca1ec7995a..572f7d1c9e 100644
--- a/locale/programs/ld-ctype.c
+++ b/locale/programs/ld-ctype.c
@@ -1866,6 +1866,9 @@ find_translit (struct localedef_t *locale, const struct charmap_t *charmap,
assert (locale != NULL);
ctype = locale->categories[LC_CTYPE].ctype;
+ if (ctype == NULL)
+ return NULL;
+
if (ctype->translit != NULL)
result = find_translit2 (ctype, charmap, wch);