zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Last-ditch maximum size limit for Pegs

Browse Source 
This makes sure that width * height <= INT_MAX, which it rather needs
to be.
This commit is contained in:
Ben Harris
2023-01-10 00:30:48 +00:00
parent 8a3fb82e23
commit 6e40605f1e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pegs.c
View File

@ -7,6 +7,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"
@ -182,6 +183,8 @@ static const char *validate_params(const game_params *params, bool full)
{ {
if (full && (params->w <= 3 || params->h <= 3)) if (full && (params->w <= 3 || params->h <= 3))
return "Width and height must both be greater than three"; return "Width and height must both be greater than three";
if (params->w > INT_MAX / params->h)
return "Width times height must not be unreasonably large";
/* /*
* It might be possible to implement generalisations of Cross * It might be possible to implement generalisations of Cross
@ -658,7 +661,9 @@ static char *new_game_desc(const game_params *params, random_state *rs,
static const char *validate_desc(const game_params *params, const char *desc) static const char *validate_desc(const game_params *params, const char *desc)
{ {
int len = params->w * params->h; int len;
len = params->w * params->h;
if (len != strlen(desc)) if (len != strlen(desc))
return "Game description is wrong length"; return "Game description is wrong length";