aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-27 08:35:44 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-27 08:35:44 -0400
commite57420c6c67b914abb01f7c3b1d999795121ce70 (patch)
treee9b6ae2b311604078fd19abbcc0c6eb9ec2ce667 /iconvdata
parent4d07db153ea9acc5c3201647bd06024e5801ae89 (diff)
downloadglibc-e57420c6c67b914abb01f7c3b1d999795121ce70.zip
glibc-e57420c6c67b914abb01f7c3b1d999795121ce70.tar.gz
glibc-e57420c6c67b914abb01f7c3b1d999795121ce70.tar.bz2
Add test for last iconv bug
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/Makefile2
-rw-r--r--iconvdata/bug-iconv9.c68
2 files changed, 69 insertions, 1 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index e0fe46a..94f860a 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -68,7 +68,7 @@ include ../Makeconfig
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
+ tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9
ifeq ($(have-thread-library),yes)
tests += bug-iconv3
endif
diff --git a/iconvdata/bug-iconv9.c b/iconvdata/bug-iconv9.c
new file mode 100644
index 0000000..e4ffd59
--- /dev/null
+++ b/iconvdata/bug-iconv9.c
@@ -0,0 +1,68 @@
+// BZ 12814
+#include <errno.h>
+#include <iconv.h>
+#include <stdio.h>
+#include <string.h>
+
+static int
+do_test (void)
+{
+ iconv_t h = iconv_open ("ISO-2022-JP-2", "UTF-8");
+ if (h == (iconv_t) -1)
+ {
+ printf ("cannot load iconv module: %m\n");
+ return 1;
+ }
+
+ // Euro sign
+ static const char inbuf[] = "\xe2\x82\xac";
+ char *in = (char *) inbuf;
+ size_t inlen = sizeof (inbuf) - 1;
+
+ char outbuf[100];
+ char *out = outbuf;
+ size_t outlen = sizeof (outbuf);
+
+ int res = 0;
+ size_t n = iconv (h, &in, &inlen, &out, &outlen);
+ if (n == (size_t) -1)
+ {
+ printf ("iconv failed with %d: %m\n", errno);
+ return 1;
+ }
+ if (n != 0)
+ {
+ printf ("iconv returned %zu, expected zero\n", n);
+ res = 1;
+ }
+ if (in != inbuf + sizeof (inbuf) - 1)
+ {
+ printf ("in advanced by %jd, expected %zu\n",
+ in - inbuf, sizeof (inbuf) - 1);
+ res = 1;
+ }
+ static const char expected[] = "\x1b\x2e\x46\x1b\x4e\x24";
+ if (out - outbuf != sizeof (expected) - 1
+ || memcmp (outbuf, expected, sizeof (expected) - 1) != 0)
+ {
+ fputs ("generated sequence is: \"", stdout);
+ for (size_t i = 0; i < out - outbuf; ++i)
+ printf ("\\x%02hhx", outbuf[i]);
+ fputs ("\", expected \"", stdout);
+ for (size_t i = 0; i < sizeof (expected) - 1; ++i)
+ printf ("\\x%02hhx", expected[i]);
+ puts ("\"");
+ res = 1;
+ }
+
+ if (iconv_close (h) != 0)
+ {
+ puts ("failed closing iconv module");
+ res = 1;
+ }
+
+ return res;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"