From 6dfb90cf55f7a7abfcbe6a4bf80b38569cc2a8b6 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 6 Jul 2005 20:10:41 +0000 Subject: InputStreamReader.java (refill): Handle no-progress case correctly. * java/io/InputStreamReader.java (refill): Handle no-progress case correctly. * gnu/gcj/convert/IOConverter.java: Add 'utf8' alias. From-SVN: r101663 --- libjava/java/io/InputStreamReader.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'libjava/java/io/InputStreamReader.java') diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index f8ad53c..e55f135 100644 --- a/libjava/java/io/InputStreamReader.java +++ b/libjava/java/io/InputStreamReader.java @@ -289,9 +289,23 @@ public class InputStreamReader extends Reader return -1; converter.setInput(in.buf, in.pos, in.count); int count = converter.read(buf, offset, length); - in.skip(converter.inpos - in.pos); - if (count > 0) - return count; + + // We might have bytes but not have made any progress. In + // this case we try to refill. If refilling fails, we assume + // we have a malformed character at the end of the stream. + if (count == 0 && converter.inpos == in.pos) + { + in.mark(in.count); + if (! in.refill ()) + throw new CharConversionException (); + in.reset(); + } + else + { + in.skip(converter.inpos - in.pos); + if (count > 0) + return count; + } } } } -- cgit v1.1