[core] avoid potential endless login on receiving login result 180

mamoe · Sep 6, 2023 · 82483f0 · 82483f0
1 parent cfbb880
commit 82483f0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt
@@ -283,8 +283,13 @@ internal class WtLogin {
 
             val t172 = t161[0x172]
             if (t172 != null) {
-                bot.client.rollbackSig = t172
+                if (t172.contentEquals(bot.client.rollbackSig)) {
+                    return LoginPacketResponse.Error(bot, 0x146, "login failed",
+                        "login result type 180 with same t172 as the client's", "")
+                }
+
                 runCatching {
+                    bot.client.rollbackSig = t172
                     bot.components[KeyRefreshProcessor].refreshKeysNow(bot.network)
                 }.fold(
                     onSuccess = { return LoginPacketResponse.Success(bot) },