Skip to content

Fix incorrect target length when parsing multibyte UTF-8 characters #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patrickmacarthur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect target length when parsing multibyte UTF-8 characters #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/kotlin/de/skyrising/mc/scanner/io.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,18 @@ class ByteBufferDataInput(private val buf: ByteBuffer) : DataInput {
skipBytes(count)
return String(chars, 0, count)
}
return readUTF(chars, count, pos)
return readUTF(chars, count, pos, utflen)
}

private fun readUTF(chararr: CharArray, start: Int, pos: Int): String {
private fun readUTF(chararr: CharArray, start: Int, pos: Int, utflen: Int): String {
var count = start
var char2: Int
var char3: Int
var chararrCount = 0
while (count < chararr.size) {
var chararrCount = count
if (utflen > chararr.size) {
throw IllegalArgumentException("utflen $utflen is greater than chararr size $chararr.size")
}
while (count < utflen) {
val c = buf[pos + count].toInt() and 0xff
when (c shr 4) {
0, 1, 2, 3, 4, 5, 6, 7 -> { /* 0xxxxxxx*/
Expand Down Expand Up @@ -99,7 +102,7 @@ class ByteBufferDataInput(private val buf: ByteBuffer) : DataInput {
"malformed input around byte $count")
}
}
skipBytes(chararr.size)
skipBytes(utflen)
return String(chararr, 0, chararrCount)
}
}
Expand Down