github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-02-13 03:16:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix java.nio.BufferUnderflowException

Browse Source
This commit is contained in:
Him188 2019-12-15 15:53:29 +08:00
parent f771077572
commit 1aafe78b77
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/InputUtils.kt
View File

@ -67,7 +67,7 @@ fun Input.readTLVMap(expectingEOF: Boolean = false, tagSize: Int = 1): MutableMa
2 -> readUShort() 2 -> readUShort()
else -> error("Unsupported tag size: $tagSize") else -> error("Unsupported tag size: $tagSize")
} }
} catch (e: EOFException) { } catch (e: Exception) { // java.nio.BufferUnderflowException is not a EOFException...
if (expectingEOF) { if (expectingEOF) {
return map return map
} }
@ -79,7 +79,7 @@ fun Input.readTLVMap(expectingEOF: Boolean = false, tagSize: Int = 1): MutableMa
check(!map.containsKey(type.toUInt())) { check(!map.containsKey(type.toUInt())) {
"Count not readTLVMap: duplicated key 0x${type.toUInt().toUHexString("")}. " + "Count not readTLVMap: duplicated key 0x${type.toUInt().toUHexString("")}. " +
"map=$map" + "map=$map" +
", duplicating value=${this.readUShortLVByteArray()}" + ", duplicating value=${this.readUShortLVByteArray().toUHexString()}" +
", remaining=" + if (expectingEOF) this.readBytes().toUHexString() else "[Not expecting EOF]" ", remaining=" + if (expectingEOF) this.readBytes().toUHexString() else "[Not expecting EOF]"
} }
try { try {