From a95b06777c56433701368f74dd7f05130fd3810f Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 12 Mar 2022 15:57:14 +0200 Subject: [PATCH 49/49] req_text_insert(): Fix fallthrough from VUT_CITYSTATUS If given range is unsupported for VUT_CITYSTATUS, execution fell through to VUT_MINLATITUDE. See osdn #44082 Signed-off-by: Marko Lindqvist --- common/reqtext.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/reqtext.c b/common/reqtext.c index 78cbcc62af..09f5ee2311 100644 --- a/common/reqtext.c +++ b/common/reqtext.c @@ -2883,9 +2883,7 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, } case VUT_CITYSTATUS: - if (preq->source.value.citystatus == CITYS_LAST) { - break; - } else { + if (preq->source.value.citystatus != CITYS_LAST) { static char *city_property = NULL; switch (preq->source.value.citystatus) { @@ -2945,6 +2943,7 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, break; } } + break; case VUT_MINLATITUDE: switch (preq->range) { -- 2.35.1