From 354032da6bb4443759c4a7415636f34406693447 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 11 Apr 2021 12:21:09 +0300 Subject: [PATCH 54/54] Fix send_city_info_at_tile() crash when the tile has no city See osdn #41975 Signed-off-by: Marko Lindqvist --- server/citytools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/citytools.c b/server/citytools.c index 6bca8dbf56..e7f879b27b 100644 --- a/server/citytools.c +++ b/server/citytools.c @@ -2298,7 +2298,7 @@ void send_city_info_at_tile(struct player *pviewer, struct conn_list *dest, if (!pcity) { pcity = tile_city(ptile); } - if (pcity->server.needs_arrange != CNA_NOT) { + if (pcity != NULL && pcity->server.needs_arrange != CNA_NOT) { pcity->server.needs_arrange = CNA_BROADCAST_PENDING; return; -- 2.30.2