diff options
author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-05-25 17:18:06 +0200 |
---|---|---|
committer | Stefan Liebler <stli@linux.vnet.ibm.com> | 2016-05-25 17:18:06 +0200 |
commit | 8f25676c83eef5c85db98f9cf027890fbe810447 (patch) | |
tree | f6eca45ee41cd0f00926a01c83f27b4eb070931f /iconv/gconv_simple.c | |
parent | a42a95c43133d69b1108f582cffa0f6986a9c3da (diff) | |
download | glibc-8f25676c83eef5c85db98f9cf027890fbe810447.zip glibc-8f25676c83eef5c85db98f9cf027890fbe810447.tar.gz glibc-8f25676c83eef5c85db98f9cf027890fbe810447.tar.bz2 |
Fix ucs4le_internal_loop in error case. [BZ #19726]
When converting from UCS4LE to INTERNAL, the input-value is checked for a too
large value and the iconv() call sets errno to EILSEQ. In this case the inbuf
argument of the iconv() call should point to the invalid character, but it
points to the beginning of the inbuf.
Thus this patch updates the pointers inptrp and outptrp before returning in
this error case.
This patch also adds a new testcase for this issue.
The new test was tested on a s390, power, intel machine.
ChangeLog:
[BZ #19726]
* iconv/gconv_simple.c (ucs4le_internal_loop): Update inptrp and
outptrp in case of an illegal input.
* iconv/tst-iconv6.c: New file.
* iconv/Makefile (tests): Add tst-iconv6.
Diffstat (limited to 'iconv/gconv_simple.c')
-rw-r--r-- | iconv/gconv_simple.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index 5412bd6..f66bf34 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -638,6 +638,8 @@ ucs4le_internal_loop (struct __gconv_step *step, continue; } + *inptrp = inptr; + *outptrp = outptr; return __GCONV_ILLEGAL_INPUT; } |