1 files changed, 4 insertions, 0 deletions
diff --git a/iconvdata/t61.c b/iconvdata/t61.c
index 915b672d3e..c5bbc42a50 100644
--- a/iconvdata/t61.c
+++ b/iconvdata/t61.c
@@ -489,6 +489,10 @@ gconv (struct gconv_step *step, struct gconv_step_data *data,
 			ch = L'\0';
 		      else
 			ch = to_ucs4_comb[inchar - 0xc1][inchar2 - 0x20];
+
+		      if (ch == L'\0')
+			/* Undo the increment for illegal characters.  */
+			--cnt;
 		    }
 		  else
 		    ch = to_ucs4[inchar];