about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--iconv/gconv_db.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e131f77af8..f75c7fdb50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-01-28  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconv/gconv_db.c (free_mem): Don't free module tree if there is none.
+
 1999-01-27  Ulrich Drepper  <drepper@cygnus.com>
 
 	* locale/programs/locale-spec.c (locale_special): Take care of
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index a5f2375f1c..e415d0d628 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -739,7 +739,8 @@ free_mem (void)
   if (__gconv_alias_db != NULL)
     __tdestroy (__gconv_alias_db, free);
 
-  free_modules_db (__gconv_modules_db);
+  if (__gconv_modules_db != NULL)
+    free_modules_db (__gconv_modules_db);
 
   if (known_derivations != NULL)
     __tdestroy (known_derivations, free_derivation);