about summary refs log tree commit diff
path: root/iconv/gconv_db.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-28 16:49:20 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-28 16:49:20 +0000
commit744541835ff4c65c32cf5ce4c08b070d5f50d0ba (patch)
tree4adfa9f97c03e31d0aad5fe6f1fe30227385fb9c /iconv/gconv_db.c
parente6df9a569331c30b85a629d3312443454273848b (diff)
downloadglibc-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_db.c')
-rw-r--r--iconv/gconv_db.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index c007732736..70cdaffbe1 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -163,6 +163,10 @@ free_derivation (void *p)
     if (deriv->steps[cnt].end_fct)
       _CALL_DL_FCT (deriv->steps[cnt].end_fct, (&deriv->steps[cnt]));
 
+  /* Free the name strings.  */
+  free ((char *) deriv->steps[0].from_name);
+  free ((char *) deriv->steps[deriv->nsteps - 1].to_name);
+
   free ((struct gconv_step *) deriv->steps);
   free (deriv);
 }