From d8fd575af9cdb66dcc3e50cc3b1b5c41ad049b4f Mon Sep 17 00:00:00 2001 From: Richard Antalik Date: Thu, 18 Nov 2021 01:32:06 +0100 Subject: Fix T93154: Crash adding multiple movie strips Some when adding multiple movies at once and only some of them have audio track, this causes crash on NULL dereference. Issue was introduced in bdbc7e12a02e to align sound and video properly. Check if sound is present in movie file. If it's not, don't try to align sound with video. --- source/blender/editors/space_sequencer/sequencer_add.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index e58e52b5e94..616953e720a 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -678,8 +678,11 @@ static void sequencer_add_movie_multiple_strips(bContext *C, load_data->start_frame += audio_frame_offset; seq_sound = SEQ_add_sound_strip(bmain, scene, ed->seqbasep, load_data, audio_skip); - int min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp); - int max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp); + int min_startdisp = 0, max_enddisp = 0; + if (seq_sound != NULL) { + min_startdisp = MIN2(seq_movie->startdisp, seq_sound->startdisp); + max_enddisp = MAX2(seq_movie->enddisp, seq_sound->enddisp); + } load_data->start_frame += max_enddisp - min_startdisp - audio_frame_offset; } -- cgit v1.2.3