[Bf-blender-cvs] [d2dda0e8b90] master: Fix T91694: VSE crashes when creating new scene

[Richard Antalik]

Commit: d2dda0e8b90208e1146a5e1317cc47f8f047dbbb
Author: Richard Antalik
Date:   Mon Sep 27 06:58:07 2021 +0200
Branches: master
https://developer.blender.org/rBd2dda0e8b90208e1146a5e1317cc47f8f047dbbb

Fix T91694: VSE crashes when creating new scene

Crash happened due to NULL dereference. Add NULL checks.

===================================================================

M       source/blender/editors/space_sequencer/sequencer_draw.c
M       source/blender/editors/transform/transform_convert_sequencer_image.c

===================================================================

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c 
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 86818661a7f..146ea970087 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -2719,7 +2719,7 @@ void sequencer_draw_preview(const bContext *C,
     sequencer_draw_borders_overlay(sseq, v2d, scene);
   }
 
-  if (!draw_backdrop) {
+  if (!draw_backdrop && scene->ed != NULL) {
     SeqCollection *collection = SEQ_query_rendered_strips(&scene->ed->seqbase, 
timeline_frame, 0);
     Sequence *seq;
     SEQ_ITERATOR_FOREACH (seq, collection) {
diff --git 
a/source/blender/editors/transform/transform_convert_sequencer_image.c 
b/source/blender/editors/transform/transform_convert_sequencer_image.c
index 5db9a2e092f..6e3f12de472 100644
--- a/source/blender/editors/transform/transform_convert_sequencer_image.c
+++ b/source/blender/editors/transform/transform_convert_sequencer_image.c
@@ -113,12 +113,17 @@ static void freeSeqData(TransInfo *UNUSED(t),
 void createTransSeqImageData(TransInfo *t)
 {
   Editing *ed = SEQ_editing_get(t->scene);
+
+  if (ed == NULL) {
+    return;
+  }
+
   ListBase *seqbase = SEQ_active_seqbase_get(ed);
   SeqCollection *strips = SEQ_query_rendered_strips(seqbase, t->scene->r.cfra, 
0);
   SEQ_filter_selected_strips(strips);
 
   const int count = SEQ_collection_len(strips);
-  if (ed == NULL || count == 0) {
+  if (count == 0) {
     SEQ_collection_free(strips);
     return;
   }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs