From 744541835ff4c65c32cf5ce4c08b070d5f50d0ba Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 28 Jan 1999 16:49:20 +0000 Subject: Update. * locale/setlocale.c (free_mem): Don't try to free C locale data and use setdata instead of doing it by hand. * iconv/gconv_conf.c (add_alias): Check that so such alias is currently stored. * iconv/gconv_db.c (free_derivation): Free names if charsets for first and last step. --- iconv/gconv_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'iconv/gconv_conf.c') diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index ece6335..a0aae43 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -206,8 +206,9 @@ add_alias (char *rp, void *modules) from, wp - from); new_alias->toname = new_alias->fromname + (to - from); - if (__tsearch (new_alias, &__gconv_alias_db, __gconv_alias_compare) - == NULL) + if (__tfind (new_alias, &__gconv_alias_db, __gconv_alias_compare) != NULL + || (__tsearch (new_alias, &__gconv_alias_db, __gconv_alias_compare) + == NULL)) /* Something went wrong, free this entry. */ free (new_alias); } -- cgit v1.1