mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 17:05:55 +01:00
CDR import: keep the children read before a list is cut short
A list whose length runs past the end of its parent, as in a file cut off inside its last page, now keeps the bytes it has, with the damage warning. Its complete children before the cut are read; other chunks that run past the end are still left out.
This commit is contained in:
1 parent
daeb83d2ee
commit
7e89bf330d
2 files changed
+26
-7
No files matched your search
+20
-7
@@ -226,10 +226,13 @@ impl<'a> Index<'a> {
|
||||
let mut at = p.start;
|
||||
let mut lists = Vec::new();
|
||||
while at < p.end {
|
||||
let Some((read, next)) = self.read_chunk(p.src, at, p.end, p.pool) else {
|
||||
let Some((read, next, cut)) = self.read_chunk(p.src, at, p.end, p.pool) else {
|
||||
push(warn, Warning::Damaged);
|
||||
break;
|
||||
};
|
||||
if cut {
|
||||
push(warn, Warning::Damaged);
|
||||
}
|
||||
at = next;
|
||||
// A redirect record whose body can't be found counts as well, so that lists redirected
|
||||
// to again and again can't repeat such records past the limit.
|
||||
@@ -288,8 +291,9 @@ impl<'a> Index<'a> {
|
||||
|
||||
/// The chunk at `at` (before `end`) of source `src`, and where the next one starts. In a
|
||||
/// compressed stream the size field is an index into the size pool (R3); in a version 16+
|
||||
/// package a chunk of 16 bytes outside one is a redirect record (R27).
|
||||
fn read_chunk(&self, src: u32, at: usize, end: usize, pool: Option<(usize, usize)>) -> Option<(Read, usize)> {
|
||||
/// package a chunk of 16 bytes outside one is a redirect record (R27). The flag is set for a
|
||||
/// list cut short at `end`.
|
||||
fn read_chunk(&self, src: u32, at: usize, end: usize, pool: Option<(usize, usize)>) -> Option<(Read, usize, bool)> {
|
||||
let head = self.span(src, at, at.checked_add(8)?.min(end))?;
|
||||
let id: [u8; 4] = head.get(..4)?.try_into().ok()?;
|
||||
let raw = u32_at(head, 4)? as usize;
|
||||
@@ -302,17 +306,26 @@ impl<'a> Index<'a> {
|
||||
}
|
||||
};
|
||||
let body = at + 8;
|
||||
let body_end = body.checked_add(size).filter(|&e| e <= end)?;
|
||||
let next = (body_end + (size & 1)).min(end);
|
||||
// A list cut short by the end of its parent keeps the bytes it has, so the children
|
||||
// before the cut are read; the caller warns that it is damaged. Other chunks are lost.
|
||||
let (size, cut) = match body.checked_add(size) {
|
||||
Some(e) if e <= end => (size, false),
|
||||
_ if id == LIST => (end.checked_sub(body)?, true),
|
||||
_ => return None,
|
||||
};
|
||||
let next = (body + size + (size & 1)).min(end);
|
||||
if cut {
|
||||
return Some((self.chunk(id, src, body, size).map_or(Read::Lost, Read::Chunk), next, true));
|
||||
}
|
||||
if self.streams.is_some() && pool.is_none() && size == REDIRECT {
|
||||
let read = match self.redirect(id, src, body) {
|
||||
Some(read) => read,
|
||||
None if self.redirect_past_limit(src, body) => Read::PastLimit,
|
||||
None => Read::Lost,
|
||||
};
|
||||
return Some((read, next));
|
||||
return Some((read, next, false));
|
||||
}
|
||||
Some((Read::Chunk(self.chunk(id, src, body, size)?), next))
|
||||
Some((Read::Chunk(self.chunk(id, src, body, size)?), next, false))
|
||||
}
|
||||
|
||||
/// Chunk `id` whose body is `len` bytes at `body` of source `src`; a list's body starts with
|
||||
|
||||
@@ -1405,6 +1405,12 @@ fn a_file_cut_short_keeps_what_it_holds() {
|
||||
let cut = &full[..full.len() - 40];
|
||||
let d = read(cut, Limits::default()).unwrap();
|
||||
assert!(d.warnings.contains(&Warning::Damaged));
|
||||
// The last page is cut inside its layer: the lists that hold the cut keep their whole
|
||||
// children, so the rectangle, ellipse and curve before the cut are read.
|
||||
assert_eq!(d.pages.len(), 1);
|
||||
let s = shapes(&d.pages[0].layers[0].objects);
|
||||
assert!(s.len() >= 3, "{}", s.len());
|
||||
assert!(matches!(s[0].geometry, Geometry::Rect { .. }) && matches!(s[1].geometry, Geometry::Ellipse { .. }));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
Reference in new issue
Block a user