blender/blender
137
431
Fork 617
Code Issues 6.3k Pull Requests 786 Projects 19 Wiki Activity

Fix #113011: Leak of Anonymous Attributes #113053

Merged
Jacques Lucke merged 5 commits from mod_moder/blender:fix_att_leak into blender-v4.0-release 2023-09-29 21:23:24 +02:00
Conversation 2 Commits 5 Files Changed 1 +15 -7
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 40b5e683a6 - Show all commits

22
source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc
View File

@ -123,19 +123,27 @@ static void clean_unused_attributes(const AnonymousAttributePropagationInfo &pro
GeometryComponent &component)
{
std::optional<MutableAttributeAccessor> attributes = component.attributes_for_write();
const Set<AttributeIDRef> all_ids = attributes.has_value() ? attributes->all_ids() :
Set<AttributeIDRef>();
for (const AttributeIDRef &id : all_ids) {
if (!attributes.has_value()) {
return;
}
Vector<std::string> unused_ids;
attributes->for_all([&](const AttributeIDRef &id, const AttributeMetaData /*meta_data*/) {
if (!id.is_anonymous()) {
continue;
return true;
}
if (skip.contains(id)) {
continue;
return true;
}
if (propagation_info.propagate(id.anonymous_id())) {
mod_moder marked this conversation as resolved Outdated
Jacques Lucke commented 2023-09-29 13:10:15 +02:00
Outdated
Review
Copy Link

Might need to be careful here, removing an attribute may invalidate data referenced by other AttributeIDRef (mainly the name). Better first gather the names of all attributes to remove, store them as std::string and then remove them in a second loop.

Might need to be careful here, removing an attribute may invalidate data referenced by other `AttributeIDRef` (mainly the name). Better first gather the names of all attributes to remove, store them as `std::string` and then remove them in a second loop.
continue;
return true;
}
attributes->remove(id);
unused_ids.append(id.name());
return true;
});
for (const std::string &unused_id : unused_ids) {
attributes->remove(unused_id);
}
}