mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-21 08:01:30 -07:00
Last-ditch maximum size limit for Same Game
This makes sure that width * height <= INT_MAX, which it rather needs to be.
This commit is contained in:
@ -67,6 +67,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"
|
||||||
@ -285,6 +286,8 @@ static const char *validate_params(const game_params *params, bool full)
|
|||||||
{
|
{
|
||||||
if (params->w < 1 || params->h < 1)
|
if (params->w < 1 || params->h < 1)
|
||||||
return "Width and height must both be positive";
|
return "Width and height must both be positive";
|
||||||
|
if (params->w > INT_MAX / params->h)
|
||||||
|
return "Width times height must not be unreasonably large";
|
||||||
|
|
||||||
if (params->ncols > 9)
|
if (params->ncols > 9)
|
||||||
return "Maximum of 9 colours";
|
return "Maximum of 9 colours";
|
||||||
|
Reference in New Issue
Block a user