diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-05-14 00:53:21 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-05-14 00:53:21 -0400 |
| commit | 1af4e29837e9969377781b47254b6e4c293353ed (patch) | |
| tree | ef585980f3ebb3250a75ed77f3b2dffa9424a7b0 | |
| parent | da62f81bdd23bb5095cd54c0b34ae6d5a93df69e (diff) | |
| download | glibc-1af4e29837e9969377781b47254b6e4c293353ed.tar.gz glibc-1af4e29837e9969377781b47254b6e4c293353ed.tar.xz glibc-1af4e29837e9969377781b47254b6e4c293353ed.zip | |
Fix handling of incomplete character storage in state
If iconv is called more than once in a row for adding bytes to the sequence while still remain under the minimum size of a character and if STORE_REST is defined, we didn't consume any input. Fix that.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | iconv/loop.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a25ddb25c3..6c125e3029 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-05-14 Ulrich Drepper <drepper@gmail.com> + + * iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before + storing incomplete byte sequence in state object. + 2011-05-11 Andreas Schwab <schwab@redhat.com> * Makeconfig (+link-pie): Indent. diff --git a/iconv/loop.c b/iconv/loop.c index da11bc209d..72fef94222 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -1,5 +1,5 @@ /* Conversion loop frame work. - Copyright (C) 1998-2002, 2003, 2005, 2008 Free Software Foundation, Inc. + Copyright (C) 1998-2003, 2005, 2008, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -399,6 +399,9 @@ SINGLE(LOOPFCT) (struct __gconv_step *step, { *inptrp = inend; #ifdef STORE_REST + while (inptr < inend) + bytebuf[inlen++] = *inptr++; + inptr = bytebuf; inptrp = &inptr; inend = &bytebuf[inlen]; |