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

Integer overflow protection in Pattern

Browse Source 
Both for grid sizes and for clue values.
This commit is contained in:
Ben Harris
2023-01-11 23:15:44 +00:00
parent 40ec3aaf09
commit dd00e9c532
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pattern.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"
@ -177,6 +178,9 @@ static const char *validate_params(const game_params *params, bool full)
{ {
if (params->w <= 0 || params->h <= 0) if (params->w <= 0 || params->h <= 0)
return "Width and height must both be greater than zero"; return "Width and height must both be greater than zero";
if (params->w > INT_MAX - 1 || params->h > INT_MAX - 1 ||
params->w > INT_MAX / params->h)
return "Puzzle must not be unreasonably large";
return NULL; return NULL;
} }
@ -909,6 +913,8 @@ static const char *validate_desc(const game_params *params, const char *desc)
p = desc; p = desc;
while (*desc && isdigit((unsigned char)*desc)) desc++; while (*desc && isdigit((unsigned char)*desc)) desc++;
n = atoi(p); n = atoi(p);
if (n > INT_MAX - 1)
return "at least one clue is grossly excessive";
rowspace -= n+1; rowspace -= n+1;
if (rowspace < 0) { if (rowspace < 0) {