[Bf-blender-cvs] [8bead3df2ff] master: Fix material null pointer reference in buttons_context.c
Sebastian Parborg
noreply at git.blender.org
Wed Sep 9 16:19:56 CEST 2020
Commit: 8bead3df2ffef1fa249b8c852b03cfcca2400c3d
Author: Sebastian Parborg
Date: Wed Sep 9 16:03:19 2020 +0200
Branches: master
https://developer.blender.org/rB8bead3df2ffef1fa249b8c852b03cfcca2400c3d
Fix material null pointer reference in buttons_context.c
ASAN reported null pointer access when converting a mesh to curves.
Check if the material is a null pointer before trying to use it.
===================================================================
M source/blender/editors/space_buttons/buttons_context.c
===================================================================
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index e567b3ca54c..2cfda8644df 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -333,6 +333,9 @@ static bool buttons_context_path_material(ButsContextPath *path)
if (ob && OB_TYPE_SUPPORT_MATERIAL(ob->type)) {
ma = BKE_object_material_get(ob, ob->actcol);
+ if (ma == NULL) {
+ return false;
+ }
RNA_id_pointer_create(&ma->id, &path->ptr[path->len]);
path->len++;
return true;
More information about the Bf-blender-cvs
mailing list