tribufu/rust-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/rust-gamedig synced 2026-05-06 15:27:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Protocol] GameSpy 3: Removed instance on unchecked .unwrap

Browse source
This commit is contained in:
CosminPerRam 2023-09-06 14:17:37 +03:00
parent 527f8f6369
commit b418319e01
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/protocols/gamespy/protocols/three/protocol.rs
View file

@ -136,9 +136,9 @@ impl GameSpy3 {
let mut values: Vec<Vec<u8>> = Vec::new();
let mut expected_number_of_packets: Option<usize> = None;
let mut reached_expected_packets_size = false;
while expected_number_of_packets.is_none() || values.len() != expected_number_of_packets.unwrap() {
while !reached_expected_packets_size {
let received_data = self.receive(None, 0)?;
let mut buf = Buffer::<BigEndian>::new(&received_data);
@ -156,8 +156,8 @@ impl GameSpy3 {
let packet_id = (id & 0x7f) as usize;
buf.move_cursor(1)?; //unknown byte regarding packet no.
if is_last {
expected_number_of_packets = Some(packet_id + 1);
if is_last && packet_id + 1 != values.len() {
reached_expected_packets_size = true;
}
while values.len() <= packet_id {
@ -270,7 +270,7 @@ fn parse_players_and_teams(packets: Vec<Vec<u8>>) -> GDResult<(Vec<Player>, Vec<
data.push(HashMap::new());
}
let entry_data = data.get_mut(offset).unwrap();
let entry_data = data.get_mut(offset).ok_or(PacketBad)?;
entry_data.insert(field_name.to_string(), item);
offset += 1;