From ff0a29df1458c0890c6f4f6f2fd252765d142423 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 28 Nov 2018 20:26:07 +1100 Subject: Fix crash entering editmode --- source/blender/blenkernel/intern/layer_utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/layer_utils.c') diff --git a/source/blender/blenkernel/intern/layer_utils.c b/source/blender/blenkernel/intern/layer_utils.c index 556ccdd3f92..2d446af9ac8 100644 --- a/source/blender/blenkernel/intern/layer_utils.c +++ b/source/blender/blenkernel/intern/layer_utils.c @@ -75,8 +75,10 @@ Base **BKE_view_layer_array_from_bases_in_mode_params( BLI_array_append(base_array, base_iter); } FOREACH_BASE_IN_MODE_END; - if (base_array != NULL) { - base_array = MEM_reallocN(base_array, sizeof(*base_array) * BLI_array_len(base_array)); + base_array = MEM_reallocN(base_array, sizeof(*base_array) * BLI_array_len(base_array)); + /* We always need a valid allocation (prevent crash on free). */ + if (base_array == NULL) { + base_array = MEM_mallocN(0, __func__); } *r_len = BLI_array_len(base_array); return base_array; -- cgit v1.2.3