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

Fix map skipping, close #145

Browse Source
This commit is contained in:
Him188 2020-03-19 11:15:11 +08:00
parent 702d8d9fa9
commit f48e27d743
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceInput.kt
View File

@ -126,17 +126,23 @@ internal class JceInput(
Jce.STRING1 -> this.input.discardExact(this.input.readUByte().toInt()) Jce.STRING1 -> this.input.discardExact(this.input.readUByte().toInt())
Jce.STRING4 -> this.input.discardExact(this.input.readInt()) Jce.STRING4 -> this.input.discardExact(this.input.readInt())
Jce.MAP -> { // map Jce.MAP -> { // map
repeat(skipToHeadAndUseIfPossibleOrFail(0) { nextHead()
repeat(skipToHeadAndUseIfPossibleOrFail(0, message = { "tag 0 not found when skipping map" }) {
readJceIntValue(it) readJceIntValue(it)
} * 2) { } * 2) {
useHead { skipField(it.type) } val currentHead = currentHead
prepareNextHead()
skipField(currentHead.type)
} }
} }
Jce.LIST -> { // list Jce.LIST -> { // list
repeat(skipToHeadAndUseIfPossibleOrFail(0) { nextHead()
repeat(skipToHeadAndUseIfPossibleOrFail(0, message = { "tag 0 not found when skipping list" }) {
readJceIntValue(it) readJceIntValue(it)
}) { }) {
useHead { skipField(it.type) } val currentHead = currentHead
prepareNextHead()
skipField(currentHead.type)
} }
} }
Jce.STRUCT_BEGIN -> { Jce.STRUCT_BEGIN -> {