blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T83776: Crashes with add-on's icon preview in menus 

Apparently the ID pointer can be NULL, which most code here assumes is
not the case. But it's very fragile & finicky, there is one code path
were it's allowed to be NULL.

Add necessary NULL-checks, an assert as sanity check and a comment to
note the possibility of NULL.
This commit is contained in:
Julian Eisel 2020-12-15 12:02:22 +01:00
parent 1b130f17c9
commit ef2151d73d
Notes: blender-bot 2023-02-14 11:07:28 +01:00 
Referenced by issue #83776, Crashes with add-on's icon preview in menus
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/render/render_preview.c
View File

@ -189,7 +189,7 @@ typedef struct IconPreview {
Main *bmain;
Scene *scene;
void *owner;
ID *id, *id_copy;
ID *id, *id_copy; /* May be NULL! (see ICON_TYPE_PREVIEW case in #ui_icon_ensure_deferred()) */
ListBase sizes;
} IconPreview;
@ -1235,6 +1235,8 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat
ID *id = sp->id;
short idtype = GS(id->name);
BLI_assert(id != NULL);
if (idtype == ID_IM) {
Image *ima = (Image *)id;
ImBuf *ibuf = NULL;
@ -1337,7 +1339,7 @@ static void other_id_types_preview_render(IconPreview *ip,
const bool is_render = !is_deferred;
/* These types don't use the ShaderPreview mess, they have their own types and functions. */
BLI_assert(!ELEM(GS(ip->id->name), ID_OB));
BLI_assert(!ip->id || !ELEM(GS(ip->id->name), ID_OB));
/* construct shader preview from image size and previewcustomdata */
sp->scene = ip->scene;
@ -1396,7 +1398,7 @@ static void icon_preview_startjob_all_sizes(void *customdata,
continue;
}
if (ELEM(GS(ip->id->name), ID_OB)) {
if (ip->id && ELEM(GS(ip->id->name), ID_OB)) {
/* Much simpler than the ShaderPreview mess used for other ID types. */
object_preview_render(ip, cur_size);
}