Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Fix localized PNG text and motion video edge cases

Neeraj Guptac9ffee7ab346
diff --git a/rust/crates/exif/src/motion.rs b/rust/crates/exif/src/motion.rs
index 35b7add6cc..19b44751ee 100644
--- a/rust/crates/exif/src/motion.rs
+++ b/rust/crates/exif/src/motion.rs
@@ -114,7 +114,10 @@ fn oplus<R: Read + Seek>(
return Ok(());
}
let len = u64::from(le32(&footer[4..]));
- if len < 8 || len > state.limits.value_bytes as u64 {
+ if len < 8 {
+ return Err(Error::Malformed("JXRS length"));
+ }
+ if len > state.limits.value_bytes as u64 {
return Err(Error::Limit("JXRS index"));
}
let base = reader
@@ -278,24 +281,31 @@ fn video_starts<R: Read + Seek>(
{
videos.push(start);
}
- if b.len < 8 {
+ if b.len < 8 || b.len % 4 != 0 {
return Err(Error::Malformed("video ftyp"));
}
- let brand = reader.array::<4>(b.start)?;
- if !matches!(
- &brand,
- b"isom"
- | b"iso2"
- | b"iso5"
- | b"iso6"
- | b"mp41"
- | b"mp42"
- | b"avc1"
- | b"qt "
- | b"M4V "
- | b"3gp4"
- | b"3gp5"
- ) {
+ let mut supported = false;
+ for position in std::iter::once(0).chain((8..b.len).step_by(4)) {
+ let brand = reader.array::<4>(b.start + position)?;
+ if matches!(
+ &brand,
+ b"isom"
+ | b"iso2"
+ | b"iso5"
+ | b"iso6"
+ | b"mp41"
+ | b"mp42"
+ | b"avc1"
+ | b"qt "
+ | b"M4V "
+ | b"3gp4"
+ | b"3gp5"
+ ) {
+ supported = true;
+ break;
+ }
+ }
+ if !supported {
break;
}
current = Some(offset);
diff --git a/rust/crates/exif/src/png.rs b/rust/crates/exif/src/png.rs
index ef0bae24e4..1cb6c518cd 100644
--- a/rust/crates/exif/src/png.rs
+++ b/rust/crates/exif/src/png.rs
@@ -48,6 +48,7 @@ fn text(data: &[u8], kind: &[u8], state: &mut State) -> Result<(), Error> {
return Err(Error::Malformed("PNG keyword"));
}
let mut compressed = false;
+ let mut language = None;
if kind == b"iTXt" {
let flag = cursor.number(1)?;
let method = cursor.number(1)?;
@@ -55,7 +56,7 @@ fn text(data: &[u8], kind: &[u8], state: &mut State) -> Result<(), Error> {
return Err(Error::Unsupported("PNG text compression"));
}
compressed = flag == 1;
- cursor.string()?;
+ language = Some(cursor.string()?).filter(|value| !value.is_empty());
cursor.string()?;
} else if kind == b"zTXt" {
if cursor.number(1)? != 0 {
@@ -121,7 +122,10 @@ fn text(data: &[u8], kind: &[u8], state: &mut State) -> Result<(), Error> {
Cow::Owned(text.iter().copied().map(char::from).collect::<String>())
};
let key: String = key.iter().copied().map(char::from).collect();
- xmp::store(state, "urn:png:text", &key, &text, None, None)
+ if language.is_some_and(|value| value.len() > state.limits.value_bytes) {
+ return Err(Error::Limit("PNG language"));
+ }
+ xmp::store(state, "urn:png:text", &key, &text, language, None)
}
fn profile(key: &[u8], text: &[u8], state: &mut State) -> Result<(), Error> {
diff --git a/rust/crates/exif/tests/integration/formats.rs b/rust/crates/exif/tests/integration/formats.rs
index 0aaa475b98..eb72cfc821 100644
--- a/rust/crates/exif/tests/integration/formats.rs
+++ b/rust/crates/exif/tests/integration/formats.rs
@@ -488,3 +488,74 @@ fn png_text_encoding_and_bad_compressed_block_recovery() {
assert_eq!(metadata.issues.len(), 1);
assert_eq!(metadata.issues[0].message, "compressed PNG text");
}
+
+#[test]
+fn motion_accepts_compatible_brands_but_not_the_minor_version() {
+ for (brands, valid, malformed) in [
+ (b"newv\0\0\0\0junkisom".as_slice(), true, false),
+ (b"isom\0\0\0\0".as_slice(), true, false),
+ (b"newvisomjunk".as_slice(), false, false),
+ (b"newv\0\0\0\0iso".as_slice(), false, true),
+ ] {
+ let video = [
+ box_bytes(b"ftyp", brands),
+ box_bytes(b"moov", &[]),
+ box_bytes(b"mdat", &[0; 16]),
+ ]
+ .concat();
+ let packet = xmp(&format!(
+ r#"<c:MicroVideoOffset xmlns:c="{}">{}</c:MicroVideoOffset>"#,
+ namespace::CAMERA,
+ video.len()
+ ));
+ let mut bytes = jpeg(&[], &packet);
+ let start = bytes.len() as u64;
+ bytes.extend(video);
+ for mode in [Mode::Summary, Mode::Details] {
+ let metadata = read(&bytes, mode);
+ assert_eq!(
+ metadata.motion_video.map(|v| (v.start, v.end)),
+ valid.then_some((start, bytes.len() as u64))
+ );
+ assert_eq!(!metadata.issues.is_empty(), malformed);
+ }
+ }
+}
+
+#[test]
+fn png_itxt_preserves_languages_with_and_without_compression() {
+ let mut bytes = b"\x89PNG\r\n\x1a\n".to_vec();
+ bytes.extend(png_chunk(b"IHDR", &[0, 0, 0, 1, 0, 0, 0, 1, 8, 2, 0, 0, 0]));
+ for (language, text, compressed) in [
+ ("en", "Snow", false),
+ ("fr", "Neige", true),
+ ("", "Ice", false),
+ ] {
+ let mut data = b"Description\0".to_vec();
+ data.extend([u8::from(compressed), 0]);
+ data.extend(language.as_bytes());
+ data.extend([0, 0]);
+ data.extend(if compressed {
+ miniz_oxide::deflate::compress_to_vec_zlib(text.as_bytes(), 6)
+ } else {
+ text.as_bytes().to_vec()
+ });
+ bytes.extend(png_chunk(b"iTXt", &data));
+ }
+ bytes.extend(png_chunk(b"IEND", &[]));
+ let metadata = read(&bytes, Mode::Details);
+ let values: Vec<_> = metadata
+ .properties("urn:png:text", "Description")
+ .map(|p| (p.language.as_deref(), p.value.as_str()))
+ .collect();
+ assert_eq!(
+ values,
+ [(Some("en"), "Snow"), (Some("fr"), "Neige"), (None, "Ice")]
+ );
+ assert_eq!(
+ read(&bytes, Mode::Summary)
+ .properties("urn:png:text", "Description")
+ .count(),
+ 0
+ );
+}
diff --git a/rust/crates/exif/tests/integration/limits.rs b/rust/crates/exif/tests/integration/limits.rs
index 44d85289f7..d52dc17e2d 100644
--- a/rust/crates/exif/tests/integration/limits.rs
+++ b/rust/crates/exif/tests/integration/limits.rs
@@ -179,3 +179,49 @@ fn png_text_limits_apply_to_utf8_output_before_conversion() {
assert!(ente_exif::read(&mut Cursor::new(&bytes), Mode::Summary, limits).is_ok());
}
}
+
+#[test]
+fn undersized_jxrs_is_recoverable() {
+ for length in 0u32..8 {
+ let bytes = [
+ jpeg(&[], ""),
+ b"jxrs".to_vec(),
+ length.to_le_bytes().to_vec(),
+ ]
+ .concat();
+ for mode in [Mode::Summary, Mode::Details] {
+ let metadata = read(&bytes, mode);
+ assert_eq!(metadata.width(), Some(30));
+ assert_eq!(metadata.issues.len(), 1);
+ assert_eq!(metadata.issues[0].message, "JXRS length");
+ }
+ }
+}
+
+#[test]
+fn png_language_obeys_value_and_retention_budgets() {
+ let bytes = [
+ b"\x89PNG\r\n\x1a\n".to_vec(),
+ png_chunk(b"iTXt", b"Note\0\0\0en-US\0\0x"),
+ ]
+ .concat();
+ for limits in [
+ Limits {
+ value_bytes: 4,
+ ..Limits::default()
+ },
+ Limits {
+ output_bytes: std::mem::size_of::<ente_exif::Property>()
+ + "urn:png:text".len()
+ + "Note".len()
+ + 1
+ + 4,
+ ..Limits::default()
+ },
+ ] {
+ assert!(matches!(
+ ente_exif::read(&mut Cursor::new(&bytes), Mode::Details, limits),
+ Err(Error::Limit(_))
+ ));
+ }
+}