godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70732 from timothyqiu/tilemap-crash 

Fix heap-use-after-free when using TileMap editor
This commit is contained in:
Rémi Verschelde 2023-01-03 12:24:10 +01:00
parent 1f53579a8f 1ac35c38be
commit 2a57a5e63f
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_map_editor.cpp
View File

@ -1488,13 +1488,15 @@ void TileMapEditorTilesPlugin::_update_fix_selected_and_hovered() {
}
// Selection if needed.
for (RBSet<TileMapCell>::Element *E = tile_set_selection.front(); E; E = E->next()) {
for (RBSet<TileMapCell>::Element *E = tile_set_selection.front(); E;) {
RBSet<TileMapCell>::Element *N = E->next();
const TileMapCell *selected = &(E->get());
if (!tile_set->has_source(selected->source_id) ||
!tile_set->get_source(selected->source_id)->has_tile(selected->get_atlas_coords()) ||
!tile_set->get_source(selected->source_id)->has_alternative_tile(selected->get_atlas_coords(), selected->alternative_tile)) {
tile_set_selection.erase(E);
}
E = N;
}
if (!tile_map_selection.is_empty()) {