diff options
| author | Andreas Schwab <schwab@suse.de> | 2015-08-17 14:05:01 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2019-06-04 14:03:04 +0200 |
| commit | 4802be92c891903caaf8cae47f685da6f26d4b9a (patch) | |
| tree | a50b1e1defaf91e887792bf7ab7c6d43b0a6ac85 /iconv/gconv_simple.c | |
| parent | dc91a19e6f71e1523f4ac179191a29b2131d74bb (diff) | |
| download | glibc-4802be92c891903caaf8cae47f685da6f26d4b9a.tar.gz glibc-4802be92c891903caaf8cae47f685da6f26d4b9a.tar.xz glibc-4802be92c891903caaf8cae47f685da6f26d4b9a.zip | |
Fix iconv buffer handling with IGNORE error handler (bug #18830)
Diffstat (limited to 'iconv/gconv_simple.c')
| -rw-r--r-- | iconv/gconv_simple.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c index 35aaa8aacd..75ce8fb1f4 100644 --- a/iconv/gconv_simple.c +++ b/iconv/gconv_simple.c @@ -76,7 +76,7 @@ __attribute ((always_inline)) internal_ucs4_loop (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, const unsigned char *outend, size_t *irreversible) { const unsigned char *inptr = *inptrp; @@ -120,7 +120,8 @@ internal_ucs4_loop_unaligned (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { const unsigned char *inptr = *inptrp; @@ -169,7 +170,8 @@ internal_ucs4_loop_single (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { mbstate_t *state = step_data->__statep; @@ -231,7 +233,7 @@ __attribute ((always_inline)) ucs4_internal_loop (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, const unsigned char *outend, size_t *irreversible) { int flags = step_data->__flags; @@ -298,7 +300,8 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { int flags = step_data->__flags; @@ -368,7 +371,8 @@ ucs4_internal_loop_single (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { mbstate_t *state = step_data->__statep; @@ -443,7 +447,7 @@ __attribute ((always_inline)) internal_ucs4le_loop (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, const unsigned char *outend, size_t *irreversible) { const unsigned char *inptr = *inptrp; @@ -488,7 +492,8 @@ internal_ucs4le_loop_unaligned (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { const unsigned char *inptr = *inptrp; @@ -540,7 +545,8 @@ internal_ucs4le_loop_single (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { mbstate_t *state = step_data->__statep; @@ -601,7 +607,7 @@ __attribute ((always_inline)) ucs4le_internal_loop (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, const unsigned char *outend, size_t *irreversible) { int flags = step_data->__flags; @@ -671,7 +677,8 @@ ucs4le_internal_loop_unaligned (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { int flags = step_data->__flags; @@ -745,7 +752,8 @@ ucs4le_internal_loop_single (struct __gconv_step *step, struct __gconv_step_data *step_data, const unsigned char **inptrp, const unsigned char *inend, - unsigned char **outptrp, unsigned char *outend, + unsigned char **outptrp, + const unsigned char *outend, size_t *irreversible) { mbstate_t *state = step_data->__statep; |