[Bf-blender-cvs] [ff0a29df145] blender2.8: Fix crash entering editmode
Campbell Barton
noreply at git.blender.org
Wed Nov 28 10:27:51 CET 2018
Commit: ff0a29df1458c0890c6f4f6f2fd252765d142423
Author: Campbell Barton
Date: Wed Nov 28 20:26:07 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBff0a29df1458c0890c6f4f6f2fd252765d142423
Fix crash entering editmode
===================================================================
M 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;
More information about the Bf-blender-cvs
mailing list