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. --- rect.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rect.c') diff --git a/rect.c b/rect.c index e2141fd..5115018 100644 --- a/rect.c +++ b/rect.c @@ -218,6 +218,8 @@ static const char *validate_params(const game_params *params, bool full) { if (params->w <= 0 || params->h <= 0) return "Width and height must both be greater than zero"; + if (params->w > INT_MAX / params->h) + return "Width times height must not be unreasonably large"; if (params->w*params->h < 2) return "Grid area must be greater than one"; if (params->expandfactor < 0.0F) -- cgit v1.1