mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-16 23:42:27 +00:00
fix(raw): validate serialized DCP first matrix with reader rules
This commit is contained in:
1 parent
42d8933a29
commit
7bc122ed0b
2 files changed
+27
-3
No files matched your search
+26
-2
@@ -96,8 +96,17 @@ pub fn write_dcp(p: &DcpProfile) -> Result<Vec<u8>, DcpError> {
|
||||
use craft_tiff::writer::srational;
|
||||
use craft_tiff::{ByteOrder, IfdBuilder, TiffWriter, Value};
|
||||
let c = &p.color;
|
||||
// ColorMatrix1 is required: do not emit a profile that our reader must reject.
|
||||
if c.color_matrix[0].is_none() {
|
||||
// ColorMatrix1 must remain usable after TIFF rational rounding, or our reader rejects it.
|
||||
let first = c.color_matrix[0].as_ref().ok_or(DcpError::NoMatrix)?;
|
||||
let serialized = first
|
||||
.iter()
|
||||
.flatten()
|
||||
.map(|v| {
|
||||
let (n, d) = srational(*v);
|
||||
f64::from(n) / f64::from(d)
|
||||
})
|
||||
.collect();
|
||||
if first.iter().flatten().any(|v| !v.is_finite()) || crate::dng::mat3(Some(serialized)).is_none() {
|
||||
return Err(DcpError::NoMatrix);
|
||||
}
|
||||
let mut ifd = IfdBuilder::new();
|
||||
@@ -167,6 +176,21 @@ mod tests {
|
||||
assert_eq!(back.color.color_matrix, p.color.color_matrix);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn writing_rejects_unusable_or_rounding_singular_first_matrices() {
|
||||
let identity = [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]];
|
||||
for matrix in [
|
||||
[[0.0; 3]; 3],
|
||||
[[1.0, 1.0, 0.0], [1.0, 1.0 + 1e-8, 0.0], [0.0, 0.0, 1.0]],
|
||||
[[f64::NAN, 0.0, 0.0], identity[1], identity[2]],
|
||||
[[f64::INFINITY, 0.0, 0.0], identity[1], identity[2]],
|
||||
] {
|
||||
let mut p = DcpProfile { name: "test".into(), camera_model: "test".into(), color: ColorData::default() };
|
||||
p.color.color_matrix[0] = Some(matrix);
|
||||
assert_eq!(write_dcp(&p), Err(DcpError::NoMatrix));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reading_a_profile_stops_past_the_size_limit() {
|
||||
let dir = std::env::temp_dir().join(format!("lc-read-dcp-{}", std::process::id()));
|
||||
|
||||
@@ -91,7 +91,7 @@ fn permute<T: Copy + Default, F: Fn(usize, usize) -> usize>(v: &mut Vec<T>, w: u
|
||||
}
|
||||
|
||||
/// A 3×3 matrix tag: nine finite values that can be inverted.
|
||||
fn mat3(v: Option<Vec<f64>>) -> Option<Matrix3> {
|
||||
pub(crate) fn mat3(v: Option<Vec<f64>>) -> Option<Matrix3> {
|
||||
let v = v?;
|
||||
if v.len() != 9 || v.iter().any(|x| !x.is_finite()) {
|
||||
return None;
|
||||
|
||||
Reference in new issue
Block a user