Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Calculate mp4 header length correctly.

Browse source
This commit is contained in:
Jonathan Giddy 2016-02-12 16:15:37 +00:00
parent a24e86e76f
commit ec0ea465ec
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/net/mime_classifier.rs
View file

@ -325,8 +325,8 @@ impl Mp4Matcher {
return false;
}
let box_size = ((data[0] as u32) << 3 | (data[1] as u32) << 2 |
(data[2] as u32) << 1 | (data[3] as u32)) as usize;
let box_size = ((data[0] as u32) << 24 | (data[1] as u32) << 16 |
(data[2] as u32) << 8 | (data[3] as u32)) as usize;
if (data.len() < box_size) || (box_size % 4 != 0) {
return false;
}

13
tests/unit/net/mime_classifier.rs
View file

@ -37,6 +37,19 @@ fn test_sniff_mp4_matcher() {
}
}
#[test]
fn test_sniff_mp4_matcher_long() {
// Check that a multi-byte length is calculated correctly
let matcher = Mp4Matcher;
let mut data: [u8; 260] = [0; 260];
&data[.. 11].clone_from_slice(
&[0x00, 0x00, 0x01, 0x04, 0x66, 0x74, 0x79, 0x70, 0x6D, 0x70, 0x34]
);
assert!(matcher.matches(&data));
}
#[cfg(test)]
fn test_sniff_with_flags(filename_orig: &path::Path,
type_string: &str,