diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-01-28 16:49:20 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-01-28 16:49:20 +0000 |
| commit | 744541835ff4c65c32cf5ce4c08b070d5f50d0ba (patch) | |
| tree | 4adfa9f97c03e31d0aad5fe6f1fe30227385fb9c /iconv/gconv_conf.c | |
| parent | e6df9a569331c30b85a629d3312443454273848b (diff) | |
| download | glibc-744541835ff4c65c32cf5ce4c08b070d5f50d0ba.tar.gz glibc-744541835ff4c65c32cf5ce4c08b070d5f50d0ba.tar.xz glibc-744541835ff4c65c32cf5ce4c08b070d5f50d0ba.zip | |
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.
Diffstat (limited to 'iconv/gconv_conf.c')
| -rw-r--r-- | iconv/gconv_conf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index ece63354da..a0aae43138 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); } |