From d2cd74223e2ce5c538f306063291129a2bf24db6 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 22 Nov 2015 23:30:09 +0000 Subject: [PATCH] Fix another out of bound buffer read in viewport map mode. Drawing of non-company tunnels/bridges. Caught by AddressSanitizer. --- src/viewport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/viewport.cpp b/src/viewport.cpp index ee4b1ae3d9..ec8d40cafb 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -2297,7 +2297,7 @@ static void ViewportMapDrawBridgeTunnel(const ViewPort * const vp, const TunnelB TileIndex tile = tbtm->from_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; uint8 colour; if (vp->map_type == VPMT_OWNER && _settings_client.gui.use_owner_colour_for_tunnelbridge && o < MAX_COMPANIES) {