From f8e1cf0dec1990f7fe97defaa67b018eae49b99d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 17 Nov 2015 22:20:14 +0000 Subject: [PATCH] Fix out of bound buffer read for non-company tunnels in viewport map mode. 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 73df1f98c0..f59eaf01e2 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -1536,7 +1536,7 @@ static void ViewportMapStoreBridgeTunnel(const ViewPort * const vp, const TileIn if (!_settings_client.gui.show_bridges_on_map) return; } 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 */ TunnelBridgeToMapVector * const tbtmv = tile_is_tunnel ? &_vd.tunnel_to_map : &_vd.bridge_to_map;