mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-16 23:42:27 +00:00
Merge pull request #1698 from storytold/codex/svgz-member-integrity
Reject damaged later SVGZ members
This commit is contained in:
1 file changed
+24
-1
+24
-1
@@ -44,13 +44,15 @@ pub fn inflate(bytes: &[u8], limit: usize) -> Result<Cow<'_, [u8]>, Error> {
|
||||
let kept = out.len();
|
||||
let room = u64::try_from(limit.saturating_sub(kept)).unwrap_or(u64::MAX).saturating_add(1);
|
||||
let mut member = flate2::bufread::GzDecoder::new(rest);
|
||||
// A valid header identifies a member even if its body or trailer is damaged.
|
||||
let recognized = member.header().is_some();
|
||||
let read = member.by_ref().take(room).read_to_end(&mut out);
|
||||
if out.len() > limit {
|
||||
return Err(Error::TooLarge(limit));
|
||||
}
|
||||
match read {
|
||||
Ok(_) => {}
|
||||
Err(e) if first => return Err(Error::Corrupt(e.to_string())),
|
||||
Err(e) if first || recognized => return Err(Error::Corrupt(e.to_string())),
|
||||
// Trailing bytes that only start like a member: not part of the file.
|
||||
Err(_) => {
|
||||
out.truncate(kept);
|
||||
@@ -161,6 +163,7 @@ mod tests {
|
||||
let mut two = compress(a.as_bytes());
|
||||
two.extend(compress(b.as_bytes()));
|
||||
assert_eq!(text(&two, MB).as_deref(), Ok(SVG));
|
||||
assert_eq!(text(&two, SVG.len()).as_deref(), Ok(SVG));
|
||||
// The limit counts every member.
|
||||
assert_eq!(inflate(&two, SVG.len() - 1), Err(Error::TooLarge(SVG.len() - 1)));
|
||||
let mut padded = compress(SVG.as_bytes());
|
||||
@@ -172,6 +175,26 @@ mod tests {
|
||||
assert_eq!(text(&junk, MB).as_deref(), Ok(SVG));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn damaged_later_members_are_errors() {
|
||||
let mut first = compress(b"<svg><line/>");
|
||||
let second = compress(b"<line/></svg>");
|
||||
|
||||
let mut bad_crc = second.clone();
|
||||
let crc = bad_crc.len() - 8;
|
||||
bad_crc[crc] ^= 1;
|
||||
first.extend_from_slice(&bad_crc);
|
||||
assert!(matches!(inflate(&first, MB), Err(Error::Corrupt(_))));
|
||||
assert!(matches!(inflate(&first, b"<svg><line/><line/></svg>".len()), Err(Error::Corrupt(_))));
|
||||
|
||||
let mut truncated = compress(b"<svg><line/>");
|
||||
truncated.extend_from_slice(&second[..second.len() - 4]);
|
||||
assert!(matches!(inflate(&truncated, MB), Err(Error::Corrupt(_))));
|
||||
let mut truncated_body = compress(b"<svg><line/>");
|
||||
truncated_body.extend_from_slice(&second[..10]);
|
||||
assert!(matches!(inflate(&truncated_body, MB), Err(Error::Corrupt(_))));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn damaged_and_nested_streams_are_errors() {
|
||||
let z = compress(SVG.as_bytes());
|
||||
|
||||
Reference in new issue
Block a user