robin/vbsp
1
0
Fork 0
mirror of https://codeberg.org/icewind/vbsp.git synced 2026-06-03 18:54:05 +02:00
Code Issues Projects Releases Wiki Activity

restore UnexpectedHeader

Browse source
This commit is contained in:
Robin Appelman 2025-02-19 23:15:02 +01:00
commit 7f2c927e7b
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bspfile.rs
View file

@ -12,7 +12,14 @@ pub struct BspFile<'a> {
impl<'a> BspFile<'a> { impl<'a> BspFile<'a> {
pub fn new(data: &'a [u8]) -> BspResult<Self> { pub fn new(data: &'a [u8]) -> BspResult<Self> {
let mut cursor = Cursor::new(data); let mut cursor = Cursor::new(data);
let header: Header = cursor.read_le()?; let header: Header = cursor.read_le().map_err(|err| match err {
binrw::Error::BadMagic { .. } => {
BspError::UnexpectedHeader(data[..4].try_into().expect(
"always enough data because otherwise a different binrw error would be hit",
))
}
error => BspError::MalformedData(error),
})?;
let directories = cursor.read_le()?; let directories = cursor.read_le()?;
Ok(BspFile { Ok(BspFile {

2
src/error.rs
View file

@ -7,6 +7,8 @@ use zip::result::ZipError;
#[non_exhaustive] #[non_exhaustive]
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum BspError { pub enum BspError {
#[error("unexpected magic numbers or version: {0:?}")]
UnexpectedHeader([u8; 4]),
#[error("bsp lump is out of bounds of the bsp file")] #[error("bsp lump is out of bounds of the bsp file")]
LumpOutOfBounds(LumpEntry), LumpOutOfBounds(LumpEntry),
#[error("bsp game lump is out of bounds of the bsp file")] #[error("bsp game lump is out of bounds of the bsp file")]