mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-21 16:05:44 -07:00
Last-ditch grid-size limit for Flood
At least prevent integer overflow when constructing the grid.
This commit is contained in:
3
flood.c
3
flood.c
@ -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)
|
||||||
|
Reference in New Issue
Block a user