godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #89801 from timothyqiu/lost-group 

Fix heap-use-after-free when converting scene group to global
This commit is contained in:
Rémi Verschelde 2024-04-08 11:20:21 +02:00
parent a2f6698098 4848bf4fd8
commit 84af65d4ba
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/groups_editor.cpp
View File

@ -157,10 +157,14 @@ void GroupsEditor::_update_groups() {
_load_scene_groups(scene_root_node); _load_scene_groups(scene_root_node);
for (const KeyValue<StringName, bool> &E : scene_groups) { for (HashMap<StringName, bool>::Iterator E = scene_groups.begin(); E;) {
if (global_groups.has(E.key)) { HashMap<StringName, bool>::Iterator next = E;
scene_groups.erase(E.key); ++next;
if (global_groups.has(E->key)) {
scene_groups.erase(E->key);
} }
E = next;
} }
updating_groups = false; updating_groups = false;