blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Fix two issues with recent new Append code. 

* ID pointer returned by `wm_file_link_append_datablock_ex` was
  improperly extracted from `WMLinkAppendDataItem` before append step.

* Code deleting linked IDs when their local matching version was re-used
  did not properly clear `LIB_TAG_DOIT` beforehand.
This commit is contained in:
Bastien Montagne 2021-09-27 16:33:41 +02:00
parent 4a0ddeb62b
commit 7270ba011c
Notes: blender-bot 2023-02-14 08:08:54 +01:00 
Referenced by issue #91750, Use-after-free with the new ID reuse for appending
Referenced by issue #91709, Blender 3.0 Append Bug
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/windowmanager/intern/wm_files_link.c
View File

@ -809,6 +809,7 @@ static void wm_append_do(WMLinkAppendData *lapp_data,
}
/* Remove linked IDs when a local existing data has been reused instead. */
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
for (itemlink = lapp_data->items.list; itemlink; itemlink = itemlink->next) {
WMLinkAppendDataItem *item = itemlink->link;
@ -822,7 +823,6 @@ static void wm_append_do(WMLinkAppendData *lapp_data,
}
BLI_assert(ID_IS_LINKED(id));
BLI_assert(id->newid != NULL);
BLI_assert((id->tag & LIB_TAG_DOIT) == 0);
id->tag |= LIB_TAG_DOIT;
item->new_id = id->newid;
@ -1347,13 +1347,13 @@ static ID *wm_file_link_append_datablock_ex(Main *bmain,
/* Link datablock. */
wm_link_do(lapp_data, NULL, bmain, scene, view_layer, v3d);
/* Get linked datablock and free working data. */
ID *id = item->new_id;
if (do_append) {
wm_append_do(lapp_data, NULL, bmain, scene, view_layer, v3d);
}
/* Get linked datablock and free working data. */
ID *id = item->new_id;
wm_link_append_data_free(lapp_data);
BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false);