Changeset 12321

Timestamp:

01/01/10 18:26:24 (11 years ago)

Author:

ehuelsmann

Message:

Fix ticket #75: infinite loop while writing unmappable

characters to an output stream - while at it,
fix the input side too.

Location:

trunk/abcl/src/org/armedbear/lisp/util

Files:

• RACFMalformedInputException.java (added)
• RACFUnmappableCharacterException.java (added)
• RandomAccessCharacterFile.java (modified) (4 diffs)

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

@@ -281 +281 @@
         fcn = raf.getChannel();
 
-        cset = (encoding == null) ? Charset.defaultCharset() : Charset.forName(encoding);
+        setEncoding(encoding);
+        bbuf = ByteBuffer.allocate(BUFSIZ);
+
+        // there is no readable data available in the buffers.
+        bbuf.flip();
+
+        // there is no write pending data in the buffers.
+        bbufIsDirty = false;
+
+        bbufIsReadable = false;
+
+        bbufpos = fcn.position();
+
+        reader = new RandomAccessReader();
+        writer = new RandomAccessWriter();
+        inputStream = new RandomAccessInputStream();
+        outputStream = new RandomAccessOutputStream();
+    }
+
+    public void setEncoding(String encoding) {
+        cset = (encoding == null)
+            ? Charset.defaultCharset() : Charset.forName(encoding);
         cdec = cset.newDecoder();
         cdec.onMalformedInput(CodingErrorAction.REPLACE);
         cdec.onUnmappableCharacter(CodingErrorAction.REPLACE);
         cenc = cset.newEncoder();
-
-        bbuf = ByteBuffer.allocate(BUFSIZ);
-
-        // there is no readable data available in the buffers.
-        bbuf.flip();
-
-        // there is no write pending data in the buffers.
-        bbufIsDirty = false;
-
-        bbufIsReadable = false;
-
-        bbufpos = fcn.position();
-
-        reader = new RandomAccessReader();
-        writer = new RandomAccessWriter();
-        inputStream = new RandomAccessInputStream();
-        outputStream = new RandomAccessOutputStream();
     }
 
@@ -366 +370 @@
             CoderResult r = cdec.decode(bbuf, cbuf, atEof );
             decodeWasUnderflow = (CoderResult.UNDERFLOW == r);
+            if (r.isMalformed())
+                // When reading encoded Unicode, we'd expect to require
+                // catching MalformedInput
+                throw new RACFMalformedInputException(bbuf.position(),
+                                                      bbuf.get(bbuf.position()),
+                                                      cset.name());
+            if (r.isUnmappable())
+                // Since we're mapping TO unicode, we'd expect to be able
+                // to map all characters
+                Debug.assertTrue(false);
+            if (CoderResult.OVERFLOW == r)
+                Debug.assertTrue(false);
         }
         if (cbuf.remaining() == len) {
@@ -388 +404 @@
     }
 
-    private final void encodeAndWrite(CharBuffer cbuf, boolean flush, boolean endOfFile) throws IOException {
+    private final void encodeAndWrite(CharBuffer cbuf, boolean flush,
+                                      boolean endOfFile) throws IOException {
         while (cbuf.remaining() > 0) {
             CoderResult r = cenc.encode(cbuf, bbuf, endOfFile);
@@ -396 +413 @@
                 bbuf.clear();
             }
+            if (r.isUnmappable()) {
+                throw new RACFUnmappableCharacterException(cbuf.position(),
+                                                           cbuf.charAt(cbuf.position()),
+                                                           cset.name());
+            }
+            if (r.isMalformed()) {
+                // We don't really expect Malformed, but not handling it
+                // will cause an infinite loop if we don't...
+                throw new RACFMalformedInputException(cbuf.position(),
+                                                      cbuf.charAt(cbuf.position()),
+                                                      cset.name());
+            }
+            if (CoderResult.UNDERFLOW == r)
+                Debug.assertTrue(false);
         }
         if (bbuf.position() > 0 && bbufIsDirty && flush) {