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 grid-size limit for Galaxies

Browse Source 
At least prevent integer overflow when constructing the grid.
This commit is contained in:
Ben Harris
2023-01-10 20:53:07 +00:00
parent b3f3345764
commit d422dd6009
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
galaxies.c
View File

@ -42,6 +42,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"
@ -282,6 +283,10 @@ static const char *validate_params(const game_params *params, bool full)
{ {
if (params->w < 3 || params->h < 3) if (params->w < 3 || params->h < 3)
return "Width and height must both be at least 3"; return "Width and height must both be at least 3";
if (params->w > INT_MAX / 2 || params->h > INT_MAX / 2 ||
params->w > (INT_MAX - params->w*2 - params->h*2 - 1) / 4 / params->h)
return "Width times height must not be unreasonably large";
/* /*
* This shouldn't be able to happen at all, since decode_params * This shouldn't be able to happen at all, since decode_params
* and custom_params will never generate anything that isn't * and custom_params will never generate anything that isn't