Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge pull request #1852 from Silvertree2010/fix/1457-effectcraft-cli-render-drops-the

BFlat6845caf21b2b
diff --cc crates/effects/src/object_matte.rs
index e61357c9f,27d29ccbd..6804ea2c7
--- a/crates/effects/src/object_matte.rs
+++ b/crates/effects/src/object_matte.rs
@@@ -281,16 -293,15 +293,19 @@@ pub fn frozen_alpha(params: &Params, la
}
let fc = frozen_cache(j)?;
if fc.key != frozen_key(params, layer_size, fps, model) {
- return None;
+ let ids = std::iter::once(effectcraft_segment::CLASSICAL).chain(effectcraft_segment::MODELS.iter().map(|m| m.id));
+ if !ids.into_iter().any(|id| fc.key == frozen_key_of(params, layer_size, fps, id)) {
+ return None;
+ }
}
let fr = fc.frames.get(&f)?;
- let a = rle::decode(&fr.a)?;
let [fw, fh] = fc.size;
- if fw == 0 || fh == 0 || a.len() != fw.checked_mul(fh)? {
+ let expected = fw.checked_mul(fh)?;
+ if fw == 0 || fh == 0 || expected > rle::MAX_PLANE_BYTES {
+ return None;
+ }
+ let a = rle::decode_bounded(&fr.a, expected)?;
+ if a.len() != expected {
return None;
}
let af: Vec<f32> = a.iter().map(|v| *v as f32 / 255.0).collect();