asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #69323 from timothyqiu/erase-in-loop

Browse source 
Fix heap-use-after-free when removing a tile in TileSet editor
This commit is contained in:
Rémi Verschelde 2022-11-29 10:26:57 +01:00
commit a3e39d7e7c
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/tiles/tile_set_atlas_source_editor.cpp
View file

@ -543,11 +543,13 @@ void TileSetAtlasSourceEditor::_update_source_inspector() {
void TileSetAtlasSourceEditor::_update_fix_selected_and_hovered_tiles() {
// Fix selected.
for (RBSet<TileSelection>::Element *E = selection.front(); E; E = E->next()) {
for (RBSet<TileSelection>::Element *E = selection.front(); E;) {
RBSet<TileSelection>::Element *N = E->next();
TileSelection selected = E->get();
if (!tile_set_atlas_source->has_tile(selected.tile) || !tile_set_atlas_source->has_alternative_tile(selected.tile, selected.alternative)) {
selection.erase(E);
}
E = N;
}
// Fix hovered.