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

Array overflow fix from James Harvey.

Browse Source 
[originally from svn r6005]
This commit is contained in:
Simon Tatham
2005-06-23 23:11:59 +00:00
parent fda72b0f1e
commit 75225284c0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
guess.c
View File

@ -221,12 +221,9 @@ static pegrow new_pegrow(int npegs)
static pegrow dup_pegrow(pegrow pegs)
{
pegrow newpegs = snew(struct pegrow);
pegrow newpegs = new_pegrow(pegs->npegs);
newpegs->npegs = pegs->npegs;
newpegs->pegs = snewn(newpegs->npegs, int);
memcpy(newpegs->pegs, pegs->pegs, newpegs->npegs * sizeof(int));
newpegs->feedback = snewn(newpegs->npegs, int);
memcpy(newpegs->feedback, pegs->feedback, newpegs->npegs * sizeof(int));
return newpegs;
@ -325,6 +322,7 @@ static game_state *dup_game(game_state *state)
int i;
*ret = *state;
ret->guesses = snewn(state->params.nguesses, pegrow);
for (i = 0; i < state->params.nguesses; i++)
ret->guesses[i] = dup_pegrow(state->guesses[i]);
@ -463,8 +461,9 @@ static int is_markable(game_params *params, pegrow pegs)
nrequired = params->allow_blank ? 1 : params->npegs;
for (i = 0; i < params->npegs; i++) {
if (pegs->pegs[i] > 0) {
colcount->pegs[pegs->pegs[i]]++;
int c = pegs->pegs[i];
if (c > 0) {
colcount->pegs[c-1]++;
nset++;
}
}