about summary refs log tree commit diff
path: root/iconv/gconv_db.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-13 01:58:04 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-13 01:58:04 +0000
commit405b8c60d0b63d21f3a1e185eddc321c842b5a9d (patch)
treefac022206af85ed84600c154a4ce98c24842c306 /iconv/gconv_db.c
parent7039a4c9129931023b60df2ef8b232e6d4ac7ca9 (diff)
downloadglibc-405b8c60d0b63d21f3a1e185eddc321c842b5a9d.tar.gz
glibc-405b8c60d0b63d21f3a1e185eddc321c842b5a9d.tar.xz
glibc-405b8c60d0b63d21f3a1e185eddc321c842b5a9d.zip
Update.
	* iconv/gconv_db.c (gen_steps): Always initialize __data field of
	step.

	* iconv/gconv_open.c (__gconv_open): Reapply
	2000-07-12 Bruno Haible <haible@clisp.cons.org>

		* iconv/gconv_open.c (__gconv_open): Merge duplicated
		code.
Diffstat (limited to 'iconv/gconv_db.c')
-rw-r--r--iconv/gconv_db.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 4aac076538..0caf310b91 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -234,6 +234,7 @@ gen_steps (struct derivation_step *best, const char *toset,
 				       &result[step_cnt]);
 
 	  /* Call the init function.  */
+	  result[step_cnt].__data = NULL;
 	  if (result[step_cnt].__init_fct != NULL)
 	     {
 	       status = DL_CALL_FCT (result[step_cnt].__init_fct,