diff mbox

[13/14] Fix ucs4le_internal_loop in error case.

Message ID 1456219278-5258-14-git-send-email-stli@linux.vnet.ibm.com
State Superseded
Headers show

Commit Message

Stefan Liebler Feb. 23, 2016, 9:21 a.m. UTC
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.

ChangeLog:

	* iconv/gconv_simple.c (ucs4le_internal_loop): Update inptrp and
	outptrp in case of an illegal input.
---
 iconv/gconv_simple.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Joseph Myers Feb. 23, 2016, 5:41 p.m. UTC | #1
If this is user-visible in a release, there should be a bug filed in 
Bugzilla (if there isn't one already open), and a testcase added to the 
testsuite.
diff mbox

Patch

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;
 	}