mirror of
https://github.com/alfg/mp4-rust.git
synced 2024-05-19 16:58:04 +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.
124 lines
3.4 KiB
Rust
124 lines
3.4 KiB
Rust
use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
|
|
use serde::Serialize;
|
|
use std::io::{Read, Seek, Write};
|
|
|
|
use crate::mp4box::*;
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize)]
|
|
pub struct FtypBox {
|
|
pub major_brand: FourCC,
|
|
pub minor_version: u32,
|
|
pub compatible_brands: Vec<FourCC>,
|
|
}
|
|
|
|
impl FtypBox {
|
|
pub fn get_type(&self) -> BoxType {
|
|
BoxType::FtypBox
|
|
}
|
|
|
|
pub fn get_size(&self) -> u64 {
|
|
HEADER_SIZE + 8 + (4 * self.compatible_brands.len() as u64)
|
|
}
|
|
}
|
|
|
|
impl Mp4Box for FtypBox {
|
|
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 mut compatible_brands = Vec::new();
|
|
for brand in self.compatible_brands.iter() {
|
|
compatible_brands.push(brand.to_string());
|
|
}
|
|
let s = format!(
|
|
"major_brand={} minor_version={} compatible_brands={}",
|
|
self.major_brand,
|
|
self.minor_version,
|
|
compatible_brands.join("-")
|
|
);
|
|
Ok(s)
|
|
}
|
|
}
|
|
|
|
impl<R: Read + Seek> ReadBox<&mut R> for FtypBox {
|
|
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
|
|
let start = box_start(reader)?;
|
|
|
|
if size < 16 || size % 4 != 0 {
|
|
return Err(Error::InvalidData("ftyp size too small or not aligned"));
|
|
}
|
|
let brand_count = (size - 16) / 4; // header + major + minor
|
|
let major = reader.read_u32::<BigEndian>()?;
|
|
let minor = reader.read_u32::<BigEndian>()?;
|
|
|
|
let mut brands = Vec::new();
|
|
for _ in 0..brand_count {
|
|
let b = reader.read_u32::<BigEndian>()?;
|
|
brands.push(From::from(b));
|
|
}
|
|
|
|
skip_bytes_to(reader, start + size)?;
|
|
|
|
Ok(FtypBox {
|
|
major_brand: From::from(major),
|
|
minor_version: minor,
|
|
compatible_brands: brands,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl<W: Write> WriteBox<&mut W> for FtypBox {
|
|
fn write_box(&self, writer: &mut W) -> Result<u64> {
|
|
let size = self.box_size();
|
|
BoxHeader::new(self.box_type(), size).write(writer)?;
|
|
|
|
writer.write_u32::<BigEndian>((&self.major_brand).into())?;
|
|
writer.write_u32::<BigEndian>(self.minor_version)?;
|
|
for b in self.compatible_brands.iter() {
|
|
writer.write_u32::<BigEndian>(b.into())?;
|
|
}
|
|
Ok(size)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use crate::mp4box::BoxHeader;
|
|
use std::io::Cursor;
|
|
|
|
#[test]
|
|
fn test_ftyp() {
|
|
let src_box = FtypBox {
|
|
major_brand: str::parse("isom").unwrap(),
|
|
minor_version: 0,
|
|
compatible_brands: vec![
|
|
str::parse("isom").unwrap(),
|
|
str::parse("iso2").unwrap(),
|
|
str::parse("avc1").unwrap(),
|
|
str::parse("mp41").unwrap(),
|
|
],
|
|
};
|
|
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::FtypBox);
|
|
assert_eq!(src_box.box_size(), header.size);
|
|
|
|
let dst_box = FtypBox::read_box(&mut reader, header.size).unwrap();
|
|
assert_eq!(src_box, dst_box);
|
|
}
|
|
}
|