aleleba/filmcraft
1
0
Fork 0
mirror of https://github.com/storytold/filmcraft.git synced 2026-10-24 10:10:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

security(mpeg2v): index picture extensions linearly (#2904)

Browse Source
This commit is contained in:
Earl Co
2026-10-23 10:53:42 -04:00
committed by GitHub
parent 70d0260b6e
commit 8119b36c21
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/mpeg2v/src/lib.rs
+9 -4
View File
@@ -338,11 +338,16 @@ pub fn access_units(es: &[u8]) -> Vec<std::ops::Range<usize>> {
}
PICTURE_START => {
// picture_structure from the picture coding extension that follows
let structure = codes[k + 1..]
let structure = codes
.iter()
.take_while(|c| c.1 == EXTENSION || c.1 == headers::USER_DATA)
.find_map(|&(p, c)| {
let end = codes.iter().find(|x| x.0 > p).map_or(es.len(), |x| x.0);
.enumerate()
.skip(k + 1)
.take_while(|(_, c)| c.1 == EXTENSION || c.1 == headers::USER_DATA)
.find_map(|(next, &(p, c))| {
// `next` is this unit's position in `codes`, so its successor gives the
// payload end directly. Searching `codes` from the beginning here made a
// stream of short picture/extension pairs quadratic to index.
let end = codes.get(next + 1).map_or(es.len(), |x| x.0);
(c == EXTENSION).then(|| Extension::parse(&es[(p + 4).min(end)..end]).ok()).flatten()
})
.and_then(|e| match e {