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

Palisade: don't leak memory on a bad move

Browse Source 
Invalid moves can turn up in corrupted save files, and puzzles
shouldn't leak memory when failing to load a corrupted save file.
This commit is contained in:
Ben Harris
2023-01-12 21:00:22 +00:00
parent c2eedeedfe
commit 38cf1955e5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
palisade.c
View File

@ -1020,7 +1020,7 @@ static game_state *execute_move(const game_state *state, const char *move)
for (i = 0; i < wh && move[i]; ++i) for (i = 0; i < wh && move[i]; ++i)
ret->borders[i] = ret->borders[i] =
(move[i] & BORDER_MASK) | DISABLED(~move[i] & BORDER_MASK); (move[i] & BORDER_MASK) | DISABLED(~move[i] & BORDER_MASK);
if (i < wh || move[i]) return NULL; /* leaks `ret', then we die */ if (i < wh || move[i]) goto badmove;
ret->cheated = ret->completed = true; ret->cheated = ret->completed = true;
return ret; return ret;
} }
@ -1036,7 +1036,7 @@ static game_state *execute_move(const game_state *state, const char *move)
ret->borders[y*w + x] ^= flag; ret->borders[y*w + x] ^= flag;
} }
if (*move) return NULL; /* leaks `ret', then we die */ if (*move) goto badmove;
if (!ret->completed) if (!ret->completed)
ret->completed = is_solved(&ret->shared->params, ret->shared->clues, ret->completed = is_solved(&ret->shared->params, ret->shared->clues,
@ -1045,7 +1045,7 @@ static game_state *execute_move(const game_state *state, const char *move)
return ret; return ret;
badmove: badmove:
sfree(ret); free_game(ret);
return NULL; return NULL;
} }