From 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 12 Jul 2007 18:26:36 +0000 Subject: 2.5-18.1 --- iconv/loop.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'iconv/loop.c') diff --git a/iconv/loop.c b/iconv/loop.c index 1918fe5007..9785bf865c 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -1,5 +1,5 @@ /* Conversion loop frame work. - Copyright (C) 1998-2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -450,6 +450,10 @@ SINGLE(LOOPFCT) (struct __gconv_step *step, #else /* We don't have enough input for another complete input character. */ + assert (inend - inptr > (state->__count & ~7)); + assert (inend - inptr <= 7); + state->__count = (state->__count & ~7) | (inend - inptr); + inlen = 0; while (inptr < inend) state->__value.__wchb[inlen++] = *inptr++; #endif -- cgit v1.2.3