Changeset 15387

Timestamp:

10/01/20 22:29:11 (2 years ago)

Author:

Mark Evenson

Message:

Reset file charset decoder before conversion

Using FILE-POSITION to rewind streams that had advanced past the EOF
was throwing internal Java exceptions.

Fixes <https://abcl.org/trac/ticket/473>.

File:

• trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/util/RandomAccessCharacterFile.java

@@ -49 +49 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderMalfunctionError;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
@@ -387 +388 @@
     final int read(char[] cb, int off, int len) throws IOException {
         CharBuffer cbuf = CharBuffer.wrap(cb, off, len);
+        cdec.reset();
         boolean decodeWasUnderflow = false;
         boolean atEof = false;
@@ -392 +394 @@
             int oldRemaining = cbuf.remaining();
             atEof = ! ensureReadBbuf(decodeWasUnderflow);
-            CoderResult r = cdec.decode(bbuf, cbuf, atEof );
+            CoderResult r;
+            try {
+              r = cdec.decode(bbuf, cbuf, atEof );
+            } catch (IllegalStateException e) {
+              throw new IOException("CharsetDecoder failed", e);
+            } catch (CoderMalfunctionError e) {
+              throw new IOException("CharsetDecoder malfunction", e);
+            }
+              
             if (oldRemaining == cbuf.remaining()
                 && CoderResult.OVERFLOW == r) {