dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix out of bound buffer read for non-company tunnels in viewport map mode.

Browse Source 
Caught by AddressSanitizer.
This commit is contained in:
Jonathan G Rennison
2015-11-17 22:20:14 +00:00
parent 73367d7209
commit f8e1cf0dec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/viewport.cpp
View File

@@ -1536,7 +1536,7 @@ static void ViewportMapStoreBridgeTunnel(const ViewPort * const vp, const TileIn
if (!_settings_client.gui.show_bridges_on_map) return; if (!_settings_client.gui.show_bridges_on_map) return;
} }
const Owner o = GetTileOwner(tile); const Owner o = GetTileOwner(tile);
if (!_legend_land_owners[_company_to_list_pos[o]].show_on_map) return; if (o < MAX_COMPANIES && !_legend_land_owners[_company_to_list_pos[o]].show_on_map) return;
/* Check if already stored */ /* Check if already stored */
TunnelBridgeToMapVector * const tbtmv = tile_is_tunnel ? &_vd.tunnel_to_map : &_vd.bridge_to_map; TunnelBridgeToMapVector * const tbtmv = tile_is_tunnel ? &_vd.tunnel_to_map : &_vd.bridge_to_map;