blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Depsgraph: Fix 'use after free' error in some cases during undo step #106661

Closed
Bastien Montagne wants to merge 1 commits from F-fix-deg-memuse-after-free into main
pull from: F-fix-deg-memuse-after-free
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 4 +7 -7
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/depsgraph/intern/node/deg_node_component.cc
View File

@ -54,7 +54,7 @@ string ComponentNode::OperationIDKey::identifier() const
bool ComponentNode::OperationIDKey::operator==(const OperationIDKey &other) const
{
return (opcode == other.opcode) && STREQ(name, other.name) && (name_tag == other.name_tag);
return (opcode == other.opcode) && (name == other.name) && (name_tag == other.name_tag);
}
uint64_t ComponentNode::OperationIDKey::hash() const
@ -63,7 +63,7 @@ uint64_t ComponentNode::OperationIDKey::hash() const
return BLI_ghashutil_combine_hash(
name_tag,
BLI_ghashutil_combine_hash(BLI_ghashutil_uinthash(opcode_as_int),
BLI_ghashutil_strhash_p(name)));
BLI_ghashutil_strhash_p(name.c_str())));
}
ComponentNode::ComponentNode()
@ -106,7 +106,7 @@ OperationNode *ComponentNode::find_operation(OperationIDKey key) const
else {
for (OperationNode *op_node : operations) {
if (op_node->opcode == key.opcode && op_node->name_tag == key.name_tag &&
STREQ(op_node->name.c_str(), key.name)) {
op_node->name == key.name) {
node = op_node;
break;
}

2
source/blender/depsgraph/intern/node/deg_node_component.h
View File

@ -33,7 +33,7 @@ struct ComponentNode : public Node {
/* Key used to look up operations within a component */
struct OperationIDKey {
OperationCode opcode;
const char *name;
string name;
int name_tag;
OperationIDKey();

4
source/blender/depsgraph/intern/node/deg_node_id.cc
View File

@ -45,14 +45,14 @@ IDNode::ComponentIDKey::ComponentIDKey(NodeType type, const char *name) : type(t
bool IDNode::ComponentIDKey::operator==(const ComponentIDKey &other) const
{
return type == other.type && STREQ(name, other.name);
return type == other.type && name == other.name;
}
uint64_t IDNode::ComponentIDKey::hash() const
{
const int type_as_int = int(type);
return BLI_ghashutil_combine_hash(BLI_ghashutil_uinthash(type_as_int),
BLI_ghashutil_strhash_p(name));
BLI_ghashutil_strhash_p(name.c_str()));
}
void IDNode::init(const ID *id, const char * /*subdata*/)

2
source/blender/depsgraph/intern/node/deg_node_id.h
View File

@ -38,7 +38,7 @@ struct IDNode : public Node {
bool operator==(const ComponentIDKey &other) const;
NodeType type;
const char *name;
string name;
};
/** Initialize 'id' node - from pointer data given. */