Fix incorrect position calculation in CharsetDecoder.
Data OUTPUT_OFFSET always gives us the number of bytes written
on output, so it's sufficient to increment the position by that number.
In particular, we do not have to subtract arrayOffset() from that
number.
Reported-By: Piotr Jastrzębski <haaawk@google.com>
Change-Id: I39ac470101f72aa4a87e31c4eb0665fe6a162e1d
diff --git a/luni/src/main/java/java/nio/charset/CharsetDecoderICU.java b/luni/src/main/java/java/nio/charset/CharsetDecoderICU.java
index 5dfdd9f..38be0c2 100644
--- a/luni/src/main/java/java/nio/charset/CharsetDecoderICU.java
+++ b/luni/src/main/java/java/nio/charset/CharsetDecoderICU.java
@@ -202,7 +202,7 @@
private void setPosition(CharBuffer out) {
if (out.hasArray()) {
- out.position(out.position() + data[OUTPUT_OFFSET] - out.arrayOffset());
+ out.position(out.position() + data[OUTPUT_OFFSET]);
} else {
out.put(output, 0, data[OUTPUT_OFFSET]);
}
diff --git a/luni/src/test/java/libcore/java/nio/charset/CharsetDecoderTest.java b/luni/src/test/java/libcore/java/nio/charset/CharsetDecoderTest.java
index e874a1b..4fa6e0c 100644
--- a/luni/src/test/java/libcore/java/nio/charset/CharsetDecoderTest.java
+++ b/luni/src/test/java/libcore/java/nio/charset/CharsetDecoderTest.java
@@ -105,4 +105,15 @@
assertEquals(1, cb.position());
assertEquals('\u2603', cb.get(0));
}
+
+ public void testBufferWithNonZeroOffset() {
+ CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder();
+ CharBuffer cb = CharBuffer.allocate(128);
+ cb.position(42);
+ CharBuffer out = cb.slice();
+ CoderResult cr = decoder.decode(
+ ByteBuffer.wrap(new byte[] { 'h', 'e', 'l', 'l', 'o'}), out, false);
+ assertTrue(cr.isUnderflow());
+ assertEquals(5, out.position());
+ }
}
