Commit28e543c

committed

Clear Utf8ByteBufCharsetDecoder#splitCharBuffer once char is complete,closeAsyncHttpClient#1357

Motivation:When multiple non US-ASCII chars are split over several chunks,Utf8ByteBufCharsetDecoder crashes with BufferOverflowException.This happens because we don't clear the splitCharBuffer in-between andonly do so once decoding is done.Modifications:Clear Utf8ByteBufCharsetDecoder#splitCharBuffer once char is completeResult:No more BufferOverflowException

1 parentb037426 commit28e543cCopy full SHA for 28e543c

File tree

2 files changed

-2

lines changed

netty-utils/src
- main/java/org/asynchttpclient/netty/util
  - Utf8ByteBufCharsetDecoder.java
- test/java/org/asynchttpclient/netty/util
  - Utf8ByteBufCharsetDecoderTest.java

2 files changed

-2

lines changed

`‎netty-utils/src/main/java/org/asynchttpclient/netty/util/Utf8ByteBufCharsetDecoder.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,13 @@ private void handleSplitCharBuffer(ByteBuffer nioBuffer, boolean endOfInput) thr`
`116`	`116`	`if (res.isError()) {`
`117`	`117`	`res.throwException();`
`118`	`118`	`}`
	`119`	`+splitCharBuffer.clear();`
`119`	`120`	`}`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`protectedvoiddecodePartial(ByteBuffernioBuffer,booleanendOfInput)throwsCharacterCodingException {`
`123`	`124`	`// deal with pending splitCharBuffer`
`124`		`-if (splitCharBuffer !=null &&splitCharBuffer.position() >0 &&nioBuffer.hasRemaining()) {`
	`125`	`+if (splitCharBuffer.position() >0 &&nioBuffer.hasRemaining()) {`
`125`	`126`	`handleSplitCharBuffer(nioBuffer,endOfInput);`
`126`	`127`	`}`
`127`	`128`

`‎netty-utils/src/test/java/org/asynchttpclient/netty/util/ByteBufUtilsTest.java‎renamed to ‎netty-utils/src/test/java/org/asynchttpclient/netty/util/Utf8ByteBufCharsetDecoderTest.java‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`importorg.testng.annotations.Test;`
`22`	`22`
`23`		`-publicclassByteBufUtilsTest {`
	`23`	`+publicclassUtf8ByteBufCharsetDecoderTest {`
`24`	`24`
`25`	`25`	`@Test`
`26`	`26`	`publicvoidtestByteBuf2BytesHasBackingArray() {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit28e543c

File tree

2 files changed

2 files changed

`‎netty-utils/src/main/java/org/asynchttpclient/netty/util/Utf8ByteBufCharsetDecoder.java‎`

`‎netty-utils/src/test/java/org/asynchttpclient/netty/util/ByteBufUtilsTest.java‎renamed to ‎netty-utils/src/test/java/org/asynchttpclient/netty/util/Utf8ByteBufCharsetDecoderTest.java‎`

0 commit comments