Avoid redundant shift character in iconv output at block boundary (bug 17197)
Commit Message
When a SI character needs to be output, but the next character no longer
fits into the buffer we leave the loop without updating our internal
shift state, causing a second SI character to be emitted at the start of
the next call.
Andreas.
[BZ #17197]
* iconvdata/ibm930.c (BODY for TO_LOOP): Record current DBCS state
immediately after emitting SI.
* iconvdata/ibm933.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm935.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm937.c (BODY for TO_LOOP): Likewise.
* iconvdata/ibm939.c (BODY for TO_LOOP): Likewise.
* iconvdata/bug-iconv10.c: New file.
* iconvdata/Makefile (tests): Add bug-iconv10.
($(objpfx)bug-iconv10.out): New rule.
---
iconvdata/Makefile | 5 ++++-
iconvdata/bug-iconv10.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
iconvdata/ibm930.c | 2 +-
iconvdata/ibm933.c | 2 +-
iconvdata/ibm935.c | 2 +-
iconvdata/ibm937.c | 2 +-
iconvdata/ibm939.c | 2 +-
7 files changed, 69 insertions(+), 6 deletions(-)
create mode 100644 iconvdata/bug-iconv10.c
@@ -67,7 +67,8 @@ modules.so := $(addsuffix .so, $(modules))
ifeq (yes,$(build-shared))
tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
- tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9
+ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
+ bug-iconv10
ifeq ($(have-thread-library),yes)
tests += bug-iconv3
endif
@@ -298,6 +299,8 @@ $(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
+$(objpfx)bug-iconv10.out: $(objpfx)gconv-modules \
+ $(addprefix $(objpfx),$(modules.so))
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
new file mode 100644
@@ -0,0 +1,60 @@
+/* bug 17197: check for redundant shift character at block boundary. */
+#include <iconv.h>
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+static int
+do_test (void)
+{
+ iconv_t cd = iconv_open ("IBM930", "UTF-8");
+ if (cd == (iconv_t) -1)
+ {
+ puts ("iconv_open failed");
+ return 1;
+ }
+
+ char instr1[] = "\xc2\xa6.";
+ const char expstr1[4] = "\016Bj\017";
+ const char expstr2[] = "K";
+ char outstr[4];
+ size_t inlen = sizeof (instr1);
+ size_t outlen = sizeof (outstr);
+ char *inptr = instr1;
+ char *outptr = outstr;
+ size_t r = iconv (cd, &inptr, &inlen, &outptr, &outlen);
+ if (r != -1
+ || errno != E2BIG
+ || inlen != sizeof (instr1) - 2
+ || inptr != instr1 + 2
+ || outlen != 0
+ || memcmp (outstr, expstr1, sizeof (expstr1)) != 0)
+ {
+ puts ("wrong first conversion");
+ return 1;
+ }
+
+ outlen = sizeof (outstr);
+ outptr = outstr;
+ r = iconv (cd, &inptr, &inlen, &outptr, &outlen);
+ if (r != 0
+ || inlen != 0
+ || outlen != sizeof (outstr) - sizeof (expstr2)
+ || memcmp (outstr, expstr2, sizeof (expstr2)) != 0)
+ {
+ puts ("wrong second conversion");
+ return 1;
+ }
+
+ if (iconv_close (cd) != 0)
+ {
+ puts ("iconv_close failed");
+ return 1;
+ }
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -256,6 +256,7 @@ enum
break; \
} \
*outptr++ = SI; \
+ curcs = sb; \
} \
\
if (__glibc_unlikely (outptr + 1 > outend)) \
@@ -269,7 +270,6 @@ enum
*outptr++ = 0x5b; \
else \
*outptr++ = cp[0]; \
- curcs = sb; \
} \
\
/* Now that we wrote the output increment the input pointer. */ \
@@ -255,6 +255,7 @@ enum
break; \
} \
*outptr++ = SI; \
+ curcs = sb; \
} \
\
if (__glibc_unlikely (outptr + 1 > outend)) \
@@ -263,7 +264,6 @@ enum
break; \
} \
*outptr++ = cp[0]; \
- curcs = sb; \
} \
\
/* Now that we wrote the output increment the input pointer. */ \
@@ -255,6 +255,7 @@ enum
break; \
} \
*outptr++ = SI; \
+ curcs = sb; \
} \
\
if (__glibc_unlikely (outptr + 1 > outend)) \
@@ -263,7 +264,6 @@ enum
break; \
} \
*outptr++ = cp[0]; \
- curcs = sb; \
} \
\
/* Now that we wrote the output increment the input pointer. */ \
@@ -255,6 +255,7 @@ enum
break; \
} \
*outptr++ = SI; \
+ curcs = sb; \
} \
\
if (__glibc_unlikely (outptr + 1 > outend)) \
@@ -263,7 +264,6 @@ enum
break; \
} \
*outptr++ = cp[0]; \
- curcs = sb; \
} \
\
/* Now that we wrote the output increment the input pointer. */ \
@@ -255,6 +255,7 @@ enum
break; \
} \
*outptr++ = SI; \
+ curcs = sb; \
} \
\
if (__glibc_unlikely (outptr + 1 > outend)) \
@@ -268,7 +269,6 @@ enum
*outptr++ = 0xb2; \
else \
*outptr++ = cp[0]; \
- curcs = sb; \
} \
\
/* Now that we wrote the output increment the input pointer. */ \