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

Last-ditch maximum size limit for Map

Browse Source 
This makes sure that width * height <= INT_MAX, which it rather needs
to be.  Also a similar check in decode_params when defaulting the
number of regions.
This commit is contained in:
Ben Harris
2023-01-10 00:19:02 +00:00
parent 261a9568fa
commit ed75535fc2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
map.c
View File

@ -14,6 +14,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"
@ -180,6 +181,8 @@ static void decode_params(game_params *params, char const *string)
params->n = atoi(p); params->n = atoi(p);
while (*p && (*p == '.' || isdigit((unsigned char)*p))) p++; while (*p && (*p == '.' || isdigit((unsigned char)*p))) p++;
} else { } else {
if (params->h > 0 && params->w > 0 &&
params->w <= INT_MAX / params->h)
params->n = params->w * params->h / 8; params->n = params->w * params->h / 8;
} }
if (*p == 'd') { if (*p == 'd') {
@ -252,6 +255,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 "Width and height must be at least two"; return "Width and height must be at least two";
if (params->w > INT_MAX / params->h)
return "Width times height must not be unreasonably large";
if (params->n < 5) if (params->n < 5)
return "Must have at least five regions"; return "Must have at least five regions";
if (params->n > params->w * params->h) if (params->n > params->w * params->h)