Removed potential crash due to unsucessful message decoding

This commit is contained in:
Wiktor Mazur
2019-09-22 19:57:33 +02:00
parent 2114f8a7f3
commit a31cd49995
2 changed files with 9 additions and 7 deletions
+6 -6
View File
@@ -20,20 +20,20 @@ static MSG_TYPE_EVENT: u8 = 4;
use super::message::Message; use super::message::Message;
use super::packet::Packet; use super::packet::Packet;
pub fn decode(payload: &[u8]) -> Vec<Message> pub fn decode(payload: &[u8]) -> Option<Vec<Message>>
{ {
let mut messages = vec![]; let mut messages = vec![];
let mut cursor = Cursor::new(payload); let mut cursor = Cursor::new(payload);
cursor.advance(3); cursor.advance(3);
let cmd_cnt = photon_protocol::deserialize_byte(&mut cursor).unwrap(); let cmd_cnt = photon_protocol::deserialize_byte(&mut cursor)?;
cursor.advance(8); cursor.advance(8);
for _ in 0..cmd_cnt { for _ in 0..cmd_cnt {
let cmd_type = photon_protocol::deserialize_byte(&mut cursor).unwrap(); let cmd_type = photon_protocol::deserialize_byte(&mut cursor)?;
cursor.advance(3); cursor.advance(3);
let cmd_length = photon_protocol::deserialize_integer(&mut cursor).unwrap(); let cmd_length = photon_protocol::deserialize_integer(&mut cursor)?;
cursor.advance(4); cursor.advance(4);
if cmd_type == LOG_OUT { if cmd_type == LOG_OUT {
@@ -53,7 +53,7 @@ pub fn decode(payload: &[u8]) -> Vec<Message>
} }
} }
messages Some(messages)
} }
fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> { fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
@@ -62,7 +62,7 @@ fn on_message(cursor: &mut Cursor<&[u8]>, msg_len: u32) -> Option<Message> {
let init = cursor.bytes().len(); let init = cursor.bytes().len();
cursor.advance(SIGNIFIER_BYTE_LENGTH); cursor.advance(SIGNIFIER_BYTE_LENGTH);
let msg_type = photon_protocol::deserialize_byte(cursor).unwrap(); let msg_type = photon_protocol::deserialize_byte(cursor)?;
let operation_length = msg_len - CMD_HEADER_LENGTH - 2; let operation_length = msg_len - CMD_HEADER_LENGTH - 2;
let mut payload = Cursor::new(&cursor.bytes()[0..operation_length as usize]); let mut payload = Cursor::new(&cursor.bytes()[0..operation_length as usize]);
+3 -1
View File
@@ -116,7 +116,9 @@ fn initialize(_py: Python) -> PyResult<u32> {
continue; continue;
} }
let meter = &mut METER.lock().unwrap(); let meter = &mut METER.lock().unwrap();
register_messages(meter, &game_protocol::decode(&packet.payload)); if let Some(messages) = game_protocol::decode(&packet.payload) {
register_messages(meter, &messages);
}
} }
} }
}); });