summary refs log tree commit diff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-04-25 17:47:32 +0000
committerUlrich Drepper <drepper@redhat.com>2006-04-25 17:47:32 +0000
commit74ed1159d1588e7012e7c91dea8d85202ed715de (patch)
tree33286a577ad565465b76ac96fc675e76d79d9849 /iconv
parentbdefc84c58dc5d7b4f9152359a06d5deb55aa146 (diff)
downloadglibc-74ed1159d1588e7012e7c91dea8d85202ed715de.tar.gz
glibc-74ed1159d1588e7012e7c91dea8d85202ed715de.tar.xz
glibc-74ed1159d1588e7012e7c91dea8d85202ed715de.zip
[BZ #2569]
2006-04-25  Ulrich Drepper  <drepper@redhat.com>
	[BZ #2569]
	* iconv/gconv_db.c (__gconv_release_step): Fix condition of assert
	call.
	* iconvdata/Makefile (tests): Add tst-iconv6.
	* iconvdata/tst-iconv6.c: New file.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/gconv_db.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 3431ce0812..6540cc393c 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -1,5 +1,5 @@
 /* Provide access to the collection of available transformation modules.
-   Copyright (C) 1997-2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 1997-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -227,7 +227,7 @@ __gconv_release_step (struct __gconv_step *step)
       step->__shlib_handle = NULL;
 #endif
     }
-  else
+  else if (step->__shlib_handle == NULL)
     /* Builtin modules should not have end functions.  */
     assert (step->__end_fct == NULL);
 }