diff --git a/ChangeLog b/ChangeLog
index ebf638f675..72c8ad625f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-25  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconvdata/euc-kr.c (euckr_from_ucs4): Set cp[0] to '\0' in case
+	of an error.  Patch by Changwoo Ryu <cwryu@debian.org>.
+
 1999-07-24  Ulrich Drepper  <drepper@cygnus.com>
 
 	* iconvdata/ksc5601.h (ksc5601_to_ucs4): Avoid invalid memory
diff --git a/iconvdata/euc-kr.c b/iconvdata/euc-kr.c
index 4f511705a4..f74d7748f9 100644
--- a/iconvdata/euc-kr.c
+++ b/iconvdata/euc-kr.c
@@ -33,6 +33,8 @@ euckr_from_ucs4 (uint32_t ch, unsigned char *cp)
 	  cp[0] |= 0x80;
 	  cp[1] |= 0x80;
 	}
+      else
+	cp[0] = '\0';
     }
   /* XXX Think about 0x5c ; '\'.  */
   else