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

Memory management and other fixes from James H.

Browse Source 
[originally from svn r8596]
This commit is contained in:
Simon Tatham
2009-06-17 20:01:45 +00:00
parent 3cd83d05e8
commit 0687980f0c
9 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
filling.c
View File

@ -1138,7 +1138,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
static game_state *execute_move(game_state *state, char *move)
{
game_state *new_state;
game_state *new_state = NULL;
const int sz = state->shared->params.w * state->shared->params.h;
if (*move == 's') {
@ -1149,18 +1149,18 @@ static game_state *execute_move(game_state *state, char *move)
} else {
int value;
char *endptr, *delim = strchr(move, '_');
if (!delim) return NULL;
if (!delim) goto err;
value = strtol(delim+1, &endptr, 0);
if (*endptr || endptr == delim+1) return NULL;
if (value < 0 || value > 9) return NULL;
if (*endptr || endptr == delim+1) goto err;
if (value < 0 || value > 9) goto err;
new_state = dup_game(state);
while (*move) {
const int i = strtol(move, &endptr, 0);
if (endptr == move) return NULL;
if (i < 0 || i >= sz) return NULL;
if (endptr == move) goto err;
if (i < 0 || i >= sz) goto err;
new_state->board[i] = value;
if (*endptr == '_') break;
if (*endptr != ',') return NULL;
if (*endptr != ',') goto err;
move = endptr + 1;
}
}
@ -1181,6 +1181,10 @@ static game_state *execute_move(game_state *state, char *move)
}
return new_state;
err:
if (new_state) free_game(new_state);
return NULL;
}
/* ----------------------------------------------------------------------