From 786d0317a86f81d391efd4fab1bb331b4959f666 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 23 Feb 2021 20:01:49 +0100 Subject: Fix assertion failure in AudioBuffers::copy_from() (#1909) A number of frames N was being split up into two parts which together were bigger than N, meaning a copy of one of the parts failed. --- src/lib/writer.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 9ebdd92a3..ad588f0a6 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -306,11 +306,14 @@ Writer::write (shared_ptr audio, DCPTime const time) end - _audio_reel->period().to }; + /* Be careful that part_lengths[0] + part_lengths[1] can't be bigger than audio->frames() */ Frame part_frames[2] = { part_lengths[0].frames_ceil(afr), - part_lengths[1].frames_ceil(afr) + part_lengths[1].frames_floor(afr) }; + DCPOMATIC_ASSERT ((part_frames[0] + part_frames[1]) <= audio->frames()); + if (part_frames[0]) { shared_ptr part (new AudioBuffers(audio, part_frames[0], 0)); _audio_reel->write (part); -- cgit v1.2.3