From b907e278751b740da7b9dc00c0cbdb93e7498919 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 22 Jan 2023 09:30:57 +0000 Subject: Add validate_params bounds checks in a few more games. Ben tells me that his recent work in this area was entirely driven by fuzzing: he added bounds checks in validate_params when the fuzzer had managed to prove that the lack of them allowed something buggy to happen. It seemed worth doing an eyeball-review pass to complement that strategy, so in this commit I've gone through and added a few more checks that restrict the area of the grid to be less than INT_MAX. Notable in this commit: cube.c had to do something complicated because in the triangular-grid modes the area isn't calculated as easily as w*h, and Range's existing check that w+h-1 < SCHAR_MAX is sufficient to rule out w*h being overlarge _but_ should be done before w*h is ever computed. --- range.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'range.c') diff --git a/range.c b/range.c index d6d17eb..a845b82 100644 --- a/range.c +++ b/range.c @@ -911,8 +911,8 @@ static const char *validate_params(const game_params *params, bool full) int const w = params->w, h = params->h; if (w < 1) return "Error: width is less than 1"; if (h < 1) return "Error: height is less than 1"; + if (w > SCHAR_MAX - (h - 1)) return "Error: w + h is too big"; if (w * h < 1) return "Error: size is less than 1"; - if (w + h - 1 > SCHAR_MAX) return "Error: w + h is too big"; /* I might be unable to store clues in my puzzle_size *grid; */ if (full) { if (w == 2 && h == 2) return "Error: can't create 2x2 puzzles"; -- cgit v1.1