nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

plug a couple of memory leaks in sp_lev.c

Browse Source 
selection_floodfill() would free the contents of its temporary
selection structure when the check function was Null but neglected
to free the allocated structure itself.  I don't know whether that
was ever triggered.

generate_way_out_method() did likewise when trying to make a hole
or trapdoor.  It reused the 'ov3' pointer without freeing it first.
'heaputil' reported instances of non-freed memory that were
allocated at line 3612 by selection_clone(), only called within
generate_way_out_method().

Change selection_free(foo) to also free(foo) after freeing foo's
fields.  Every use was already
  selection_free(foo);
  free(foo);
except for the two instances of memory leak.
This commit is contained in:
PatR
2020-02-10 14:23:47 -08:00
parent bade2f19b2
commit 1b7ac93930
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/sp_lev.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 sp_lev.c $NHDT-Date: 1580610435 2020/02/02 02:27:15 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.153 $ */
/* NetHack 3.6 sp_lev.c $NHDT-Date: 1581373396 2020/02/10 22:23:16 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.155 $ */
/* Copyright (c) 1989 by Jean-Christophe Collet */
/* NetHack may be freely redistributed. See license for details. */
@@ -3597,11 +3597,12 @@ void
selection_free(sel)
struct selectionvar *sel;
{
if (!sel)
return;
Free(sel->map);
sel->map = NULL;
sel->wid = sel->hei = 0;
if (sel) {
Free(sel->map);
sel->map = NULL;
sel->wid = sel->hei = 0;
free((genericptr_t) sel);
}
}
struct selectionvar *
@@ -3812,7 +3813,6 @@ int dir;
selection_setpoint(x, y, ov, 1);
selection_free(tmp);
free(tmp);
}
static int FDECL((*selection_flood_check_func), (int, int));
@@ -3924,7 +3924,6 @@ boolean diagonals;
#undef SEL_FLOOD_STACK
#undef SEL_FLOOD_CHKDIR
selection_free(tmp);
free(tmp);
}
/* McIlroy's Ellipse Algorithm */
@@ -4571,9 +4570,7 @@ struct selectionvar *ov;
res = FALSE;
gotitdone:
selection_free(ov2);
free(ov2);
selection_free(ov3);
free(ov3);
return res;
}
@@ -4606,19 +4603,19 @@ ensure_way_out()
do {
ret = TRUE;
for (x = 0; x < COLNO; x++)
for (x = 1; x < COLNO; x++)
for (y = 0; y < ROWNO; y++)
if (ACCESSIBLE(levl[x][y].typ)
&& !selection_getpoint(x, y, ov)) {
if (generate_way_out_method(x,y, ov))
selection_floodfill(ov, x,y, TRUE);
if (generate_way_out_method(x, y, ov))
selection_floodfill(ov, x, y, TRUE);
ret = FALSE;
goto outhere;
}
outhere: ;
outhere:
;
} while (!ret);
selection_free(ov);
free(ov);
}
int
@@ -5191,10 +5188,8 @@ int prop;
if (sel) {
selection_iterate(sel, sel_set_wall_property, (genericptr_t) &prop);
if (freesel) {
if (freesel)
selection_free(sel);
free(sel);
}
}
}