Mirrors/lofty-rs
2
0
Fork 0
mirror of https://github.com/Serial-ATA/lofty-rs synced 2024-12-12 13:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

EBML: Make use of max_id_length when reading

Browse source 
Signed-off-by: Serial <69764315+Serial-ATA@users.noreply.github.com>
This commit is contained in:
Serial 2023-11-24 14:10:50 -05:00
parent d472a88337
commit 82acd9e0ed
No known key found for this signature in database
GPG key ID: DA95198DC17C4568
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ebml/element_reader.rs
View file

@ -13,12 +13,12 @@ pub struct ElementHeader {
}
impl ElementHeader {
fn read<R>(reader: &mut R, max_vint_length: u8) -> Result<Self>
fn read<R>(reader: &mut R, max_id_length: u8, max_vint_length: u8) -> Result<Self>
where
R: Read,
{
Ok(Self {
id: VInt::parse(reader, max_vint_length)?,
id: VInt::parse(reader, max_id_length)?,
size: VInt::parse(reader, max_vint_length)?,
})
}
@ -141,7 +141,11 @@ where
}
fn next_master(&mut self) -> Result<ElementReaderYield> {
let header = ElementHeader::read(&mut self.reader, self.ctx.max_size_length)?;
let header = ElementHeader::read(
&mut self.reader,
self.ctx.max_id_length,
self.ctx.max_size_length,
)?;
let Some(master) = MASTER_ELEMENTS.get(&header.id) else {
// We encountered an unknown master element
return Ok(ElementReaderYield::Unknown(header));
@ -164,7 +168,11 @@ where
return self.next_master();
}
let header = ElementHeader::read(&mut self.reader, self.ctx.max_size_length)?;
let header = ElementHeader::read(
&mut self.reader,
self.ctx.max_id_length,
self.ctx.max_size_length,
)?;
let Some((_, child)) = current_master
.children