diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-11-08 00:04:24 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-11-08 00:04:24 +0000 |
| commit | f2a8406a4f5974230d33995105160a8bacbce500 (patch) | |
| tree | ae84626e8353895088f0457362dcf446fbc68557 /iconvdata | |
| parent | 9ca230d62f1813679700f821d3de48ce4aa73f2a (diff) | |
[BZ #5277]
2007-11-07 Ulrich Drepper <drepper@redhat.com>
[BZ #5277]
* iconv/loop.c (STANDARD_TO_LOOP_ERR_HANDLER): If conversion failed
because output buffer is too small break, don't loop.
* iconvdata/Makefile (tests): Add bug-iconv6.
* iconvdata/bug-iconv6.c: New file.
Diffstat (limited to 'iconvdata')
| -rw-r--r-- | iconvdata/Makefile | 2 | ||||
| -rw-r--r-- | iconvdata/bug-iconv6.c | 52 |
2 files changed, 53 insertions, 1 deletions
diff --git a/iconvdata/Makefile b/iconvdata/Makefile index bf52d52f8f..ca4c713179 100644 --- a/iconvdata/Makefile +++ b/iconvdata/Makefile @@ -67,7 +67,7 @@ include ../Makeconfig ifeq (yes,$(build-shared)) tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \ - tst-iconv6 bug-iconv5 + tst-iconv6 bug-iconv5 bug-iconv6 ifeq ($(have-thread-library),yes) tests += bug-iconv3 endif diff --git a/iconvdata/bug-iconv6.c b/iconvdata/bug-iconv6.c new file mode 100644 index 0000000000..f920954bc2 --- /dev/null +++ b/iconvdata/bug-iconv6.c @@ -0,0 +1,52 @@ +#include <string.h> +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <iconv.h> +#include <locale.h> + +static const char testbuf[] = { + 0xEF, 0xBE, 0x9F, 0xD0, 0xB4, 0xEF, 0xBE, 0x9F, 0x29, 0xEF, 0xBE, 0x8E, + 0xEF, 0xBE, 0x9F, 0xEF, 0xBD, 0xB6, 0xEF, 0xBD, 0xB0, 0xEF, 0xBE, 0x9D +}; + +static int +do_test (void) +{ + setlocale (LC_ALL, "en_US.UTF-8"); + iconv_t ic = iconv_open ("ISO-2022-JP//TRANSLIT", "UTF-8"); + if (ic == (iconv_t) -1) + { + puts ("iconv_open failed"); + return 1; + } + size_t outremain = sizeof testbuf; + char outbuf[outremain]; + char *inp = (char *) testbuf; + char *outp = outbuf; + size_t inremain = sizeof testbuf; + + int ret = iconv (ic, &inp, &inremain, &outp, &outremain); + + int result = 0; + if (ret == (size_t) -1) + { + if (errno == E2BIG) + puts ("buffer too small reported. OK"); + else + { + printf ("iconv failed with %d (%m)\n", errno); + result = 0; + } + } + else + { + printf ("iconv returned %d\n", ret); + result = 1; + } + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |