ref: 0687980f0c3204d283848ba41761a7724e4a6168
parent: 3cd83d05e899e62232b68ea95cf7f07505ebd79f
author: Simon Tatham <[email protected]>
date: Wed Jun 17 16:01:45 EDT 2009
Memory management and other fixes from James H. [originally from svn r8596]
--- a/bridges.c
+++ b/bridges.c
@@ -2244,6 +2244,8 @@
if (sscanf(move, "%d,%d,%d,%d,%d%n",
&x1, &y1, &x2, &y2, &nl, &n) != 5)
goto badmove;
+ if (!INGRID(ret, x1, y1) || !INGRID(ret, x2, y2))
+ goto badmove;
is1 = INDEX(ret, gridi, x1, y1);
is2 = INDEX(ret, gridi, x2, y2);
if (!is1 || !is2) goto badmove;
@@ -2253,6 +2255,8 @@
if (sscanf(move, "%d,%d,%d,%d%n",
&x1, &y1, &x2, &y2, &n) != 4)
goto badmove;
+ if (!INGRID(ret, x1, y1) || !INGRID(ret, x2, y2))
+ goto badmove;
is1 = INDEX(ret, gridi, x1, y1);
is2 = INDEX(ret, gridi, x2, y2);
if (!is1 || !is2) goto badmove;
@@ -2260,6 +2264,8 @@
} else if (c == 'M') {if (sscanf(move, "%d,%d%n",
&x1, &y1, &n) != 2)
+ goto badmove;
+ if (!INGRID(ret, x1, y1))
goto badmove;
is1 = INDEX(ret, gridi, x1, y1);
if (!is1) goto badmove;
--- a/filling.c
+++ b/filling.c
@@ -1138,7 +1138,7 @@
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 @@
} 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 @@
}
return new_state;
+
+err:
+ if (new_state) free_game(new_state);
+ return NULL;
}
/* ----------------------------------------------------------------------
--- a/galaxies.c
+++ b/galaxies.c
@@ -365,7 +365,7 @@
case s_tile:
if (sp->flags & F_TILE_ASSOC) {space *dot = sp2dot(state, sp->x, sp->y);
- if (dot->flags & F_DOT)
+ if (dot && dot->flags & F_DOT)
*p++ = (dot->flags & F_DOT_BLACK) ? 'B' : 'W';
else
*p++ = '?'; /* association with not-a-dot. */
@@ -1450,6 +1450,7 @@
state = copy2;
}
}
+ sfree(posns);
}
#endif
--- a/lightup.c
+++ b/lightup.c
@@ -727,6 +727,7 @@
debug_state(state);
assert(!"place_lights failed to resolve overlapping lights!");
}
+ sfree(numindices);
}
/* Fills in all black squares with numbers of adjacent lights. */
--- a/map.c
+++ b/map.c
@@ -1373,6 +1373,7 @@
*/
}
+ sfree(origcolouring);
sfree(subcolouring);
free_scratch(rsc);
@@ -1788,9 +1789,9 @@
map = snewn(2*wh, int);
ret = parse_edge_list(params, &desc, map);
+ sfree(map);
if (ret)
return ret;
- sfree(map);
if (*desc != ',')
return "Expected comma before clue list";
--- a/midend.c
+++ b/midend.c
@@ -947,6 +947,7 @@
me->ourgame->encode_params(preset, TRUE);
me->npresets++;
}
+ sfree(e);
}
}
--- a/net.c
+++ b/net.c
@@ -950,8 +950,10 @@
}
sfree(perim2);
- if (i == nperim)
+ if (i == nperim) {+ sfree(perimeter);
return; /* nothing we can do! */
+ }
/*
* Now we've constructed a new link, we need to find the entire
@@ -2195,7 +2197,7 @@
static game_state *execute_move(game_state *from, char *move)
{game_state *ret;
- int tx, ty, n, noanim, orig;
+ int tx = -1, ty = -1, n, noanim, orig;
ret = dup_game(from);
@@ -2244,6 +2246,7 @@
}
}
if (!noanim) {+ if (tx == -1 || ty == -1) { free_game(ret); return NULL; }ret->last_rotate_x = tx;
ret->last_rotate_y = ty;
}
--- a/pattern.c
+++ b/pattern.c
@@ -569,7 +569,7 @@
if (*desc && isdigit((unsigned char)*desc)) { do {p = desc;
- while (desc && isdigit((unsigned char)*desc)) desc++;
+ while (*desc && isdigit((unsigned char)*desc)) desc++;
n = atoi(p);
rowspace -= n+1;
@@ -620,7 +620,7 @@
if (*desc && isdigit((unsigned char)*desc)) { do {p = desc;
- while (desc && isdigit((unsigned char)*desc)) desc++;
+ while (*desc && isdigit((unsigned char)*desc)) desc++;
state->rowdata[state->rowsize * i + state->rowlen[i]++] =
atoi(p);
} while (*desc++ == '.');
--- a/solo.c
+++ b/solo.c
@@ -582,7 +582,6 @@
nb->blocks[i] = nb->blocks_data + i*nb->max_nr_squares;
#ifdef STANDALONE_SOLVER
- nb->blocknames = (char **)smalloc(b->c * b->r *(sizeof(char *)+80));
memcpy(nb->blocknames, b->blocknames, b->c * b->r *(sizeof(char *)+80));
{int i;
@@ -1697,7 +1696,10 @@
usage->cube = snewn(cr*cr*cr, unsigned char);
usage->grid = grid; /* write straight back to the input */
if (kgrid) {- int nclues = kblocks->nr_blocks;
+ int nclues;
+
+ assert(kblocks);
+ nclues = kblocks->nr_blocks;
/*
* Allow for expansion of the killer regions, the absolute
* limit is obviously one region per square.
@@ -2589,6 +2591,8 @@
"one solution");
#endif
+ sfree(usage->sq2region);
+ sfree(usage->regions);
sfree(usage->cube);
sfree(usage->row);
sfree(usage->col);
@@ -2598,6 +2602,7 @@
free_block_structure(usage->extra_cages);
sfree(usage->extra_clues);
}
+ if (usage->kclues) sfree(usage->kclues);
sfree(usage);
solver_free_scratch(scratch);
@@ -3551,13 +3556,8 @@
blocks = alloc_block_structure (c, r, area, cr, cr);
- if (params->killer) {- kblocks = alloc_block_structure (c, r, area, cr, area);
- kgrid = snewn(area, digit);
- } else {- kblocks = NULL;
- kgrid = NULL;
- }
+ kblocks = NULL;
+ kgrid = (params->killer) ? snewn(area, digit) : NULL;
#ifdef STANDALONE_SOLVER
assert(!"This should never happen, so we don't need to create blocknames");
@@ -3587,6 +3587,7 @@
make_blocks_from_whichblock(blocks);
if (params->killer) {+ if (kblocks) free_block_structure(kblocks);
kblocks = gen_killer_cages(cr, rs, params->kdiff > DIFF_KSINGLE);
}
@@ -3753,6 +3754,11 @@
desc = encode_puzzle_desc(params, grid, blocks, kgrid, kblocks);
sfree(grid);
+ free_block_structure(blocks);
+ if (params->killer) {+ free_block_structure(kblocks);
+ sfree(kgrid);
+ }
return desc;
}
@@ -4150,6 +4156,7 @@
sfree(state->immutable);
sfree(state->pencil);
sfree(state->grid);
+ if (state->kgrid) sfree(state->kgrid);
sfree(state);
}