Last-ditch grid-size limit for Flood

At least prevent integer overflow when constructing the grid.
This commit is contained in:
Ben Harris
2023-01-10 21:20:35 +00:00
parent 26d0633f87
commit da220a77d1

View File

@ -31,6 +31,7 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <limits.h>
#include <math.h> #include <math.h>
#include "puzzles.h" #include "puzzles.h"
@ -209,6 +210,8 @@ static const char *validate_params(const game_params *params, bool full)
{ {
if (params->w < 2 && params->h < 2) if (params->w < 2 && params->h < 2)
return "Grid must contain at least two squares"; return "Grid must contain at least two squares";
if (params->w > INT_MAX / params->h)
return "Width times height must not be unreasonably large";
if (params->colours < 3 || params->colours > 10) if (params->colours < 3 || params->colours > 10)
return "Must have between 3 and 10 colours"; return "Must have between 3 and 10 colours";
if (params->leniency < 0) if (params->leniency < 0)