1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99800 from amarsero/bone2d-redo-crash

Browse Source 
Fix use after free in redo of "Create Custom Bone2D(s) from Node(s)"
This commit is contained in:
Thaddeus Crews 2024-12-30 08:58:56 -06:00
commit e55ea94c73
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -4843,11 +4843,12 @@ void CanvasItemEditor::_popup_callback(int p_op) {
undo_redo->add_do_method(new_bone, "add_child", n2d); undo_redo->add_do_method(new_bone, "add_child", n2d);
undo_redo->add_do_method(n2d, "set_transform", Transform2D()); undo_redo->add_do_method(n2d, "set_transform", Transform2D());
undo_redo->add_do_method(this, "_set_owner_for_node_and_children", new_bone, editor_root); undo_redo->add_do_method(this, "_set_owner_for_node_and_children", new_bone, editor_root);
undo_redo->add_do_reference(new_bone);
undo_redo->add_undo_method(new_bone, "remove_child", n2d); undo_redo->add_undo_method(new_bone, "remove_child", n2d);
undo_redo->add_undo_method(n2d_parent, "add_child", n2d); undo_redo->add_undo_method(n2d_parent, "add_child", n2d);
undo_redo->add_undo_method(n2d_parent, "remove_child", new_bone);
undo_redo->add_undo_method(n2d, "set_transform", new_bone->get_transform()); undo_redo->add_undo_method(n2d, "set_transform", new_bone->get_transform());
undo_redo->add_undo_method(new_bone, "queue_free");
undo_redo->add_undo_method(this, "_set_owner_for_node_and_children", n2d, editor_root); undo_redo->add_undo_method(this, "_set_owner_for_node_and_children", n2d, editor_root);
} }
undo_redo->commit_action(); undo_redo->commit_action();