jake/libpso
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

check that the entire packet was read

Browse Source
This commit is contained in:
Jake Probst 2019-06-23 15:51:11 -07:00
parent 47a07a63ae
commit 8caa48a1e6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
psopacket/src/lib.rs
View File

@ -206,18 +206,29 @@ pub fn pso_packet(attr: TokenStream, item: TokenStream) -> TokenStream {
impl PSOPacket for #this_struct { impl PSOPacket for #this_struct {
fn from_bytes(data: &Vec<u8>) -> Result<#this_struct, PacketParseError> { fn from_bytes(data: &Vec<u8>) -> Result<#this_struct, PacketParseError> {
let mut cur = std::io::Cursor::new(data); let mut cur = std::io::Cursor::new(data);
cur.seek(SeekFrom::Start(2)).unwrap();
let mut b: [u8; 2] = [0; 2]; let mut b: [u8; 2] = [0; 2];
cur.read(&mut b).unwrap(); cur.read(&mut b).unwrap();
let len = u16::from_le_bytes(b);
cur.read(&mut b).unwrap();
let cmd = u16::from_le_bytes(b); let cmd = u16::from_le_bytes(b);
if cmd != #pkt_cmd { if cmd != #pkt_cmd {
return Err(PacketParseError::WrongPacketCommand); return Err(PacketParseError::WrongPacketCommand);
} }
Ok(#this_struct { if len as usize != data.len() {
return Err(PacketParseError::WrongPacketSize(len, data.len()));
}
let result = Ok(#this_struct {
#(#from_bytes)* #(#from_bytes)*
}) });
if cur.position() as usize != data.len() {
return Err(PacketParseError::DataStructNotLargeEnough(cur.position(), data.len()));
}
result
} }
fn as_bytes(&self) -> Vec<u8> { fn as_bytes(&self) -> Vec<u8> {
let mut buf: Vec<u8> = Vec::new(); let mut buf: Vec<u8> = Vec::new();