[Bf-blender-cvs] [ded49409011] master: Fix possible dereference of nullptr mask
Sergey Sharybin
noreply at git.blender.org
Wed Jan 27 16:55:06 CET 2021
Commit: ded494090114696dfc1c919205ff890c20c62bd2
Author: Sergey Sharybin
Date: Wed Jan 27 16:54:09 2021 +0100
Branches: master
https://developer.blender.org/rBded494090114696dfc1c919205ff890c20c62bd2
Fix possible dereference of nullptr mask
===================================================================
M source/blender/editors/mask/mask_query.c
===================================================================
diff --git a/source/blender/editors/mask/mask_query.c b/source/blender/editors/mask/mask_query.c
index 8f4f14a1ba8..eace146dbe9 100644
--- a/source/blender/editors/mask/mask_query.c
+++ b/source/blender/editors/mask/mask_query.c
@@ -609,17 +609,17 @@ bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2], bool
Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
Mask *mask = CTX_data_edit_mask(C);
- /* Use evaluated mask to take animation into account.
- * The animation of splies is not "flushed" back to original, so need to explicitly
- * sue evaluated datablock here. */
- Mask *mask_eval = (Mask *)DEG_get_evaluated_id(depsgraph, &mask->id);
-
bool ok = false;
if (mask == NULL) {
return ok;
}
+ /* Use evaluated mask to take animation into account.
+ * The animation of splies is not "flushed" back to original, so need to explicitly
+ * sue evaluated datablock here. */
+ Mask *mask_eval = (Mask *)DEG_get_evaluated_id(depsgraph, &mask->id);
+
INIT_MINMAX2(min, max);
for (MaskLayer *mask_layer = mask_eval->masklayers.first; mask_layer != NULL;
mask_layer = mask_layer->next) {
More information about the Bf-blender-cvs
mailing list