griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix BKE_id_move_to_same_lib behavior with invalid parameters.

Browse Source 
* Early return in case the given `id` is already in the same library as
  its target `owner_id` (in addition to both being local data).
* Assert with message AND return in case the given `id` is a linked ID
  from a different library.

The second point somewhat mitigates the severity of #130194.
This commit is contained in:
Bastien Montagne
2024-11-13 10:14:57 +01:00
parent d8b90ee422
commit cf0c91a545
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/lib_id.cc
View File

@@ -861,8 +861,14 @@ ID *BKE_id_copy_for_use_in_bmain(Main *bmain, const ID *id)
void BKE_id_move_to_same_lib(Main &bmain, ID &id, const ID &owner_id)
{
BLI_assert(id.lib == nullptr);
if (owner_id.lib == nullptr) {
if (owner_id.lib == id.lib) {
/* `id` is already in the target library, nothing to do. */
return;
}
if (ID_IS_LINKED(&id)) {
BLI_assert_msg(false, "Only local IDs can be moved into a library");
/* Protect release builds against errors in calling code, as continuing here can lead to
* critical Main data-base corruption. */
return;
}