From 5cc9bfb811854b66c4a570e8100b8a1aad037f0e Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Tue, 10 Jan 2023 00:20:36 +0000 Subject: [PATCH] Last-ditch maximum size limit for Mines This makes sure that width * height <= INT_MAX, which it rather needs to be. Also a similar check in decode_params when defaulting the number of mines. --- mines.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mines.c b/mines.c index 22332ba..c933f49 100644 --- a/mines.c +++ b/mines.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "tree234.h" @@ -162,7 +163,9 @@ static void decode_params(game_params *params, char const *string) params->n = atoi(p); while (*p && (*p == '.' || isdigit((unsigned char)*p))) p++; } else { - params->n = params->w * params->h / 10; + if (params->h > 0 && params->w > 0 && + params->w <= INT_MAX / params->h) + params->n = params->w * params->h / 10; } while (*p) { @@ -258,6 +261,8 @@ static const char *validate_params(const game_params *params, bool full) */ if (full && params->unique && (params->w <= 2 || params->h <= 2)) return "Width and height must both be greater than two"; + if (params->w > INT_MAX / params->h) + return "Width times height must not be unreasonably large"; if (params->n < 0) return "Mine count may not be negative"; if (params->n > params->w * params->h - 9)