From ad9c53abdbc8e6da18909a5b6bf65a7fe8b10b71 Mon Sep 17 00:00:00 2001 From: NHOrus Date: Sun, 13 Aug 2017 15:56:37 +0100 Subject: [PATCH] Validate dwarves and tally --- saveresume.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/saveresume.c b/saveresume.c index ecfc643..724ca00 100644 --- a/saveresume.c +++ b/saveresume.c @@ -159,6 +159,31 @@ bool is_valid(struct game_t valgame) return false; } } + + /* Bounds check for dwarves */ + if (valgame.dtotal < 0 || valgame.dtotal > NDWARVES || + valgame.dkill < 0 || valgame.dkill > NDWARVVES) { + return false; + } + + /* Validate that we didn't die too many times in save */ + if (valgame.numdie >= NDEATHS) { + return false; + } + + /* Recalculate tally, throw the towel if in disagreement */ + long temp_tally = 0; + for (int treasure = 1; treasure <= NOBJECTS; treasure++) { + if (objects[treasure].is_treasure) { + if (valgame.prop[treasure] == STATE_NOTFOUND) { + ++temp_tally; + } + } + } + if (temp_tally != valgame.tally) { + return false; + } + return true; } -- 2.31.1