mirror of
https://github.com/alfg/mp4-rust.git
synced 2024-05-30 05:28:05 +00:00
7cfdffbd71
* Fix several overflows in box and track processing * Use size_of::<Type>() instead of magic numbers * Fix a panic in Mp4Track::read_sample() for one-past-the-end This appears to be a bug unmasked by other changes. read_sample() calls sample_offset() then sample_size(), and assumes that if the former returns Ok then the latter does as well. However, if the sample_id is one past the end, sample_offset() might succeed (it only checks samples _up to_ the given sample_id but not _including_ it) while sample_size() fails (because the sample doesn't exist). read_sample() will then panic. Fix this by duplicating the error propagation (that is currently done for sample_offset) for sample_size, instead of unwrapping. This is a cautious change that fixes the bug; alternatively, having sample_offset() call sample_size() on the given sample_id and propagate any error might also work. * Account for header size in box processing overflow fixes * Ensure that boxes aren't bigger than their containers Together with the entry_count checks, this eliminates several OOMs when reading incorrect mp4 files. * Fix order of arithmetic operations This was due to an incorrect transcription when switching to checked arithmetic, and fixes a bug that could cause attempted lookups of the wrong chunk_id.
142 lines
3.7 KiB
Rust
142 lines
3.7 KiB
Rust
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
|
|
use serde::Serialize;
|
|
use std::io::{Read, Seek, Write};
|
|
use std::mem::size_of;
|
|
|
|
use crate::mp4box::*;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize)]
|
|
pub struct StcoBox {
|
|
pub version: u8,
|
|
pub flags: u32,
|
|
|
|
#[serde(skip_serializing)]
|
|
pub entries: Vec<u32>,
|
|
}
|
|
|
|
impl StcoBox {
|
|
pub fn get_type(&self) -> BoxType {
|
|
BoxType::StcoBox
|
|
}
|
|
|
|
pub fn get_size(&self) -> u64 {
|
|
HEADER_SIZE + HEADER_EXT_SIZE + 4 + (4 * self.entries.len() as u64)
|
|
}
|
|
}
|
|
|
|
impl Mp4Box for StcoBox {
|
|
fn box_type(&self) -> BoxType {
|
|
self.get_type()
|
|
}
|
|
|
|
fn box_size(&self) -> u64 {
|
|
self.get_size()
|
|
}
|
|
|
|
fn to_json(&self) -> Result<String> {
|
|
Ok(serde_json::to_string(&self).unwrap())
|
|
}
|
|
|
|
fn summary(&self) -> Result<String> {
|
|
let s = format!("entries={}", self.entries.len());
|
|
Ok(s)
|
|
}
|
|
}
|
|
|
|
impl<R: Read + Seek> ReadBox<&mut R> for StcoBox {
|
|
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
|
let start = box_start(reader)?;
|
|
|
|
let (version, flags) = read_box_header_ext(reader)?;
|
|
|
|
let header_size = HEADER_SIZE + HEADER_EXT_SIZE;
|
|
let other_size = size_of::<u32>(); // entry_count
|
|
let entry_size = size_of::<u32>(); // chunk_offset
|
|
let entry_count = reader.read_u32::<BigEndian>()?;
|
|
if u64::from(entry_count)
|
|
> size
|
|
.saturating_sub(header_size)
|
|
.saturating_sub(other_size as u64)
|
|
/ entry_size as u64
|
|
{
|
|
return Err(Error::InvalidData(
|
|
"stco entry_count indicates more entries than could fit in the box",
|
|
));
|
|
}
|
|
let mut entries = Vec::with_capacity(entry_count as usize);
|
|
for _i in 0..entry_count {
|
|
let chunk_offset = reader.read_u32::<BigEndian>()?;
|
|
entries.push(chunk_offset);
|
|
}
|
|
|
|
skip_bytes_to(reader, start + size)?;
|
|
|
|
Ok(StcoBox {
|
|
version,
|
|
flags,
|
|
entries,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<W: Write> WriteBox<&mut W> for StcoBox {
|
|
fn write_box(&self, writer: &mut W) -> Result<u64> {
|
|
let size = self.box_size();
|
|
BoxHeader::new(self.box_type(), size).write(writer)?;
|
|
|
|
write_box_header_ext(writer, self.version, self.flags)?;
|
|
|
|
writer.write_u32::<BigEndian>(self.entries.len() as u32)?;
|
|
for chunk_offset in self.entries.iter() {
|
|
writer.write_u32::<BigEndian>(*chunk_offset)?;
|
|
}
|
|
|
|
Ok(size)
|
|
}
|
|
}
|
|
|
|
impl std::convert::TryFrom<&co64::Co64Box> for StcoBox {
|
|
type Error = std::num::TryFromIntError;
|
|
|
|
fn try_from(co64: &co64::Co64Box) -> std::result::Result<Self, Self::Error> {
|
|
let entries = co64
|
|
.entries
|
|
.iter()
|
|
.copied()
|
|
.map(u32::try_from)
|
|
.collect::<std::result::Result<Vec<_>, _>>()?;
|
|
Ok(Self {
|
|
version: 0,
|
|
flags: 0,
|
|
entries,
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::mp4box::BoxHeader;
|
|
use std::io::Cursor;
|
|
|
|
#[test]
|
|
fn test_stco() {
|
|
let src_box = StcoBox {
|
|
version: 0,
|
|
flags: 0,
|
|
entries: vec![267, 1970, 2535, 2803, 11843, 22223, 33584],
|
|
};
|
|
let mut buf = Vec::new();
|
|
src_box.write_box(&mut buf).unwrap();
|
|
assert_eq!(buf.len(), src_box.box_size() as usize);
|
|
|
|
let mut reader = Cursor::new(&buf);
|
|
let header = BoxHeader::read(&mut reader).unwrap();
|
|
assert_eq!(header.name, BoxType::StcoBox);
|
|
assert_eq!(src_box.box_size(), header.size);
|
|
|
|
let dst_box = StcoBox::read_box(&mut reader, header.size).unwrap();
|
|
assert_eq!(src_box, dst_box);
|
|
}
|
|
}
|