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

Mosaic: fault out-of-bounds moves in execute_move()

Browse Source 
Returning NULL in this case is better than dereferencing it.
This commit is contained in:
Ben Harris
2023-01-07 20:33:42 +00:00
parent 68f9fae973
commit e616d7aac9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mosaic.c
View File

@ -1297,6 +1297,10 @@ static game_state *execute_move(const game_state *state, const char *move)
return new_state; return new_state;
} }
cell = get_coords(new_state, new_state->cells_contents, x, y); cell = get_coords(new_state, new_state->cells_contents, x, y);
if (cell == NULL) {
sfree(new_state);
return NULL;
}
if (*cell >= STATE_OK_NUM) { if (*cell >= STATE_OK_NUM) {
*cell &= STATE_OK_NUM; *cell &= STATE_OK_NUM;
} }
@ -1363,6 +1367,10 @@ static game_state *execute_move(const game_state *state, const char *move)
for (i = 0; i < diff; i++) { for (i = 0; i < diff; i++) {
cell = get_coords(new_state, new_state->cells_contents, cell = get_coords(new_state, new_state->cells_contents,
x + (dirX * i), y + (dirY * i)); x + (dirX * i), y + (dirY * i));
if (cell == NULL) {
sfree(new_state);
return NULL;
}
if ((*cell & STATE_OK_NUM) == 0) { if ((*cell & STATE_OK_NUM) == 0) {
*cell = last_state; *cell = last_state;
update_board_state_around(new_state, x + (dirX * i), update_board_state_around(new_state, x + (dirX * i),