From 639aaef5ae32dd6f0cba4626aa2da0769822ae20 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 8 Jan 2023 09:15:38 +0200 Subject: [PATCH 22/22] city_sum_add_real(): Fix strcmp(?, NULL) call See osdn #46488 Signed-off-by: Marko Lindqvist --- client/citydlg_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/citydlg_common.c b/client/citydlg_common.c index 14f5cc2f23..2d7fce0813 100644 --- a/client/citydlg_common.c +++ b/client/citydlg_common.c @@ -506,13 +506,13 @@ static void city_sum_add_real(struct city_sum *sum, double value, { size_t i; - /* likely to lead to quadratic behaviour, but who cares: */ + /* Likely to lead to quadratic behaviour, but who cares: */ for (i = 0; i < sum->n; i++) { fc_assert(sum->sums != NULL); if ((strcmp(sum->sums[i].posdesc, posdesc) == 0) && (strcmp(sum->sums[i].negdesc, negdesc) == 0) && ((sum->sums[i].auxfmt == auxfmt) - || (strcmp(sum->sums[i].auxfmt, auxfmt) == 0)) + || (auxfmt != NULL && !strcmp(sum->sums[i].auxfmt, auxfmt))) && sum->sums[i].suppress_if_zero == suppress_if_zero) { /* Looks like we already have an entry like this. Accumulate values. */ sum->sums[i].value += value; -- 2.39.0