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

Filling: validate length of auto-solve move strings

Browse Source 
Without this, execute_move() can end up reading off the end of the
move string, which isn't very friendly.  Also remove the comment
saying that the move string doesn't have to be null-terminated,
because now it does.
This commit is contained in:
Ben Harris
2023-01-08 09:57:53 +00:00
parent a45f1830cf
commit 8a06ff26fc
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filling.c
View File

@ -1110,8 +1110,6 @@ static bool solver(const int *orig, int w, int h, char **solution) {
**solution = 's'; **solution = 's';
for (i = 0; i < sz; ++i) (*solution)[i + 1] = ss.board[i] + '0'; for (i = 0; i < sz; ++i) (*solution)[i + 1] = ss.board[i] + '0';
(*solution)[sz + 1] = '\0'; (*solution)[sz + 1] = '\0';
/* We don't need the \0 for execute_move (the only user)
* I'm just being printf-friendly in case I wanna print */
} }
sfree(ss.dsf); sfree(ss.dsf);
@ -1589,6 +1587,7 @@ static game_state *execute_move(const game_state *state, const char *move)
if (*move == 's') { if (*move == 's') {
int i = 0; int i = 0;
if (strlen(move) != sz + 1) return NULL;
new_state = dup_game(state); new_state = dup_game(state);
for (++move; i < sz; ++i) new_state->board[i] = move[i] - '0'; for (++move; i < sz; ++i) new_state->board[i] = move[i] - '0';
new_state->cheated = true; new_state->cheated = true;