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

Net: validate co-ordinates in decode_ui()

Browse Source 
The offset and centre location should be within the grid.  Otherwise the
redraw code will suffer an assertion failure.  This save file
demonstrates the problem:

SAVEFILE:41:Simon Tatham's Portable Puzzle Collection
VERSION :1:1
GAME    :3:Net
PARAMS  :4:5x5w
CPARAMS :4:5x5w
DESC    :25:9893e85285bb72e6de5182741
UI      :9:O0,0;C6,6
NSTATES :1:1
STATEPOS:1:1
This commit is contained in:
Ben Harris
2023-02-14 00:06:10 +00:00
parent 9be7db547a
commit a4c6f21b8e
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
net.c
View File

@ -2044,8 +2044,20 @@ static char *encode_ui(const game_ui *ui)
static void decode_ui(game_ui *ui, const char *encoding,
const game_state *state)
{
sscanf(encoding, "O%d,%d;C%d,%d",
&ui->org_x, &ui->org_y, &ui->cx, &ui->cy);
int org_x, org_y, cx, cy;
if (sscanf(encoding, "O%d,%d;C%d,%d", &org_x, &org_y, &cx, &cy) == 4) {
if (0 <= org_x && org_x < state->width &&
0 <= org_y && org_y < state->height) {
ui->org_x = org_x;
ui->org_y = org_y;
}
if (0 <= cx && cx < state->width &&
0 <= cy && cy < state->height) {
ui->cx = cx;
ui->cy = cy;
}
}
}
static void game_changed_state(game_ui *ui, const game_state *oldstate,