fix: pkg interpreting

This commit is contained in:
Didier Slof 2023-07-16 19:00:56 +02:00
parent 70a22810b2
commit 1ec1d5c9b2
Signed by: didier
GPG key ID: 01E71F18AA4398E5

View file

@ -9,28 +9,22 @@ impl TryFrom<Vec<u8>> for PKGFile {
fn try_from(value: Vec<u8>) -> Result<Self, ()> { fn try_from(value: Vec<u8>) -> Result<Self, ()> {
match value[0] { match value[0] {
1 => { 1 => {
let header: Vec<u32> = value[..3] let header: Vec<u32> = value[..3].iter().map(|v| u32::from(*v)).collect();
.iter()
.map(|v| u32::from(*v))
.collect();
let manifest_size: u32 = (header[1] << 8) | header[2]; let manifest_size: u32 = (header[1] << 8) | header[2];
if manifest_size > value.len() as u32 { if manifest_size > value.len() as u32 {
return Err(()); return Err(());
} }
Ok(PKGFile { Ok(PKGFile {
manifest: match String::from_utf8( manifest: match String::from_utf8(
value[ value[3..(manifest_size as usize + 3)].to_vec(),
3..(manifest_size as usize + 3) ) {
].to_vec()
)
{
Ok(s) => s, Ok(s) => s,
_ => return Err(()) _ => return Err(()),
}, },
data: value[(manifest_size as usize + 3)..].to_vec(), data: value[(manifest_size as usize + 3)..].to_vec(),
}) })
} }
_ => Err(()) _ => Err(()),
} }
} }
} }
@ -45,4 +39,4 @@ impl Into<Vec<u8>> for PKGFile {
bytes.extend(self.data); bytes.extend(self.data);
bytes bytes
} }
} }