Fix position bug in NettyDataBuffer::toByteBuffer

Closes gh-31605
spring-projects · Nov 15, 2023 · 8868fe2 · 8868fe2
1 parent c373f49
commit 8868fe2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java b/spring-core/src/main/java/org/springframework/core/io/buffer/NettyDataBuffer.java
@@ -313,7 +313,7 @@ public void toByteBuffer(int srcPos, ByteBuffer dest, int destPos, int length) {
 		Assert.notNull(dest, "Dest must not be null");
 
 		dest = dest.duplicate().clear();
-		dest.put(destPos, this.byteBuf.nioBuffer(), srcPos, length);
+		dest.put(destPos, this.byteBuf.nioBuffer(srcPos, length), 0, length);
 	}
 
 	@Override

diff --git a/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java b/spring-core/src/test/java/org/springframework/core/io/buffer/DataBufferTests.java
@@ -796,10 +796,6 @@ void slice(DataBufferFactory bufferFactory) {
 		if (!(bufferFactory instanceof Netty5DataBufferFactory)) {
 			assertThat(result).isEqualTo(new byte[]{'b', 'c'});
 		}
-		else {
-			assertThat(result).isEqualTo(new byte[]{'b', 0});
-			release(slice);
-		}
 		release(buffer);
 	}
 
@@ -938,4 +934,15 @@ void getByte(DataBufferFactory bufferFactory) {
 		release(buffer);
 	}
 
+	@ParameterizedDataBufferAllocatingTest // gh-31605
+	void shouldHonorSourceBuffersReadPosition(DataBufferFactory bufferFactory) {
+		DataBuffer dataBuffer = bufferFactory.wrap("ab".getBytes(StandardCharsets.UTF_8));
+		dataBuffer.readPosition(1);
+
+		ByteBuffer byteBuffer = ByteBuffer.allocate(dataBuffer.readableByteCount());
+		dataBuffer.toByteBuffer(byteBuffer);
+
+		assertThat(StandardCharsets.UTF_8.decode(byteBuffer).toString()).isEqualTo("b");
+	}
+
 }