[Bf-blender-cvs] [d962ca73877] outliner-cpp-refactor: Fix possible null-pointer dereference in new Outliner tree building code
Julian Eisel
noreply at git.blender.org
Sat Nov 7 01:27:33 CET 2020
Commit: d962ca738779788869eee756343f27a6f8f7f7e5
Author: Julian Eisel
Date: Sat Nov 7 01:23:36 2020 +0100
Branches: outliner-cpp-refactor
https://developer.blender.org/rBd962ca738779788869eee756343f27a6f8f7f7e5
Fix possible null-pointer dereference in new Outliner tree building code
===================================================================
M source/blender/editors/space_outliner/outliner_tree.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 4654377e7e5..991d831d6e0 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -2322,9 +2322,11 @@ void outliner_build_tree(Main *mainvar,
space_outliner->runtime->tree_view = outliner_tree_view_create(space_outliner->outlinevis,
space_outliner);
- TreeSourceData source_data = {.bmain = mainvar, .scene = scene, .view_layer = view_layer};
- space_outliner->tree = outliner_tree_view_build_tree(space_outliner->runtime->tree_view,
- &source_data);
+ if (space_outliner->runtime->tree_view) {
+ TreeSourceData source_data = {.bmain = mainvar, .scene = scene, .view_layer = view_layer};
+ space_outliner->tree = outliner_tree_view_build_tree(space_outliner->runtime->tree_view,
+ &source_data);
+ }
if (!BLI_listbase_is_empty(&space_outliner->tree)) {
/* Skip. */
More information about the Bf-blender-cvs
mailing list