Merge remote-tracking branch 'origin/main' into fix/dynamic-tune-vals

server/channelserver/handlers.go

@@ -257,7 +257,7 @@ func logoutPlayer(s *Session) {
 	removeSessionFromStage(s)
 
 	saveData, err := GetCharacterSaveData(s, s.charID)
-	if err != nil {
+	if err != nil || saveData == nil {
 		s.logger.Error("Failed to get savedata")
 		return
 	}

server/channelserver/handlers_character.go

@@ -81,6 +81,10 @@ func GetCharacterSaveData(s *Session, charID uint32) (*CharacterSaveData, error)
 		return nil, err
 	}
 
+	if len(saveData.decompSave) < pointerKQF {
+		return nil, err
+	}
+
 	saveData.updateStructWithSaveData()
 
 	return saveData, nil