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

Merge pull request #35619 from timothyqiu/tile-map-access

Browse source 
Fixes invalid read when using fill tool in empty tilemap
This commit is contained in:
Rémi Verschelde 2020-01-27 14:11:17 +01:00 committed by GitHub
commit 887950b793
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/plugins/tile_map_editor_plugin.cpp
View file

@ -627,13 +627,14 @@ PoolVector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool era
if (r != bucket_cache_rect) if (r != bucket_cache_rect)
_clear_bucket_cache(); _clear_bucket_cache();
// Cache grid is not initialized // Cache grid is not initialized
if (bucket_cache_visited == 0) { if (bucket_cache_visited == NULL) {
bucket_cache_visited = new bool[area]; bucket_cache_visited = new bool[area];
invalidate_cache = true; invalidate_cache = true;
} }
// Tile ID changed or position wasn't visited by the previous fill // Tile ID changed or position wasn't visited by the previous fill
int loc = (p_start.x - r.position.x) + (p_start.y - r.position.y) * r.get_size().x; const int loc = (p_start.x - r.position.x) + (p_start.y - r.position.y) * r.get_size().x;
if (prev_id != bucket_cache_tile || !bucket_cache_visited[loc]) { const bool in_range = 0 <= loc && loc < area;
if (prev_id != bucket_cache_tile || (in_range && !bucket_cache_visited[loc])) {
invalidate_cache = true; invalidate_cache = true;
} }
if (invalidate_cache) { if (invalidate_cache) {
@ -893,7 +894,7 @@ void TileMapEditor::_draw_fill_preview(Control *p_viewport, int p_cell, const Po
void TileMapEditor::_clear_bucket_cache() { void TileMapEditor::_clear_bucket_cache() {
if (bucket_cache_visited) { if (bucket_cache_visited) {
delete[] bucket_cache_visited; delete[] bucket_cache_visited;
bucket_cache_visited = 0; bucket_cache_visited = NULL;
} }
} }
@ -1924,7 +1925,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
transpose = false; transpose = false;
bucket_cache_tile = -1; bucket_cache_tile = -1;
bucket_cache_visited = 0; bucket_cache_visited = NULL;
invalid_cell.resize(1); invalid_cell.resize(1);
invalid_cell.write[0] = TileMap::INVALID_CELL; invalid_cell.write[0] = TileMap::INVALID_CELL;