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

fix a memory leak

Browse Source 
Memory allocated for a trap in getlev() wasn't being freed.  There
is already one extra allocation which is supposed to get freed after
the loop, but the 'keepgoing' flag caused an extra trap allocation
before loop termination.  So the unintentional one got freed but did
so by intercepting the free for the end-of-list one.

Fruit had similar code which applied to full game save and restore
rather than level save and restore so wasn't as noticeable.
This commit is contained in:
PatR
2019-11-29 18:31:45 -08:00
parent dd1d978b84
commit 756f6a1006
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/restore.c
+12 -11
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 restore.c $NHDT-Date: 1561485720 2019/06/25 18:02:00 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.131 $ */ /* NetHack 3.6 restore.c $NHDT-Date: 1575081102 2019/11/30 02:31:42 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.155 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2009. */ /*-Copyright (c) Michael Allison, 2009. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -565,12 +565,11 @@ static struct fruit *
loadfruitchn(nhfp) loadfruitchn(nhfp)
NHFILE *nhfp; NHFILE *nhfp;
{ {
register struct fruit *flist, *fnext = (struct fruit *) 0; register struct fruit *flist, *fnext;
boolean keepgoing;
flist = 0; flist = 0;
keepgoing = TRUE; for (;;) {
while (fnext = newfruit(), keepgoing) { fnext = newfruit();
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t)fnext, sizeof *fnext); mread(nhfp->fd, (genericptr_t)fnext, sizeof *fnext);
if (nhfp->fieldlevel) if (nhfp->fieldlevel)
@@ -579,7 +578,7 @@ NHFILE *nhfp;
fnext->nextf = flist; fnext->nextf = flist;
flist = fnext; flist = fnext;
} else } else
keepgoing = FALSE; break;
} }
dealloc_fruit(fnext); dealloc_fruit(fnext);
return flist; return flist;
@@ -1227,7 +1226,6 @@ boolean ghostly;
int hpid; int hpid;
xchar dlvl; xchar dlvl;
int x, y; int x, y;
boolean keepgoing;
#ifdef TOS #ifdef TOS
short tlev; short tlev;
#endif #endif
@@ -1288,7 +1286,8 @@ boolean ghostly;
for (c = 0; c < COLNO; ++c) for (c = 0; c < COLNO; ++c)
for (r = 0; r < ROWNO; ++r) for (r = 0; r < ROWNO; ++r)
sfi_schar(nhfp, &g.lastseentyp[c][r], "lev", "g.lastseentyp", 1); sfi_schar(nhfp, &g.lastseentyp[c][r],
"lev", "g.lastseentyp", 1);
sfi_long(nhfp, &g.omoves, "lev", "timestmp", 1); sfi_long(nhfp, &g.omoves, "lev", "timestmp", 1);
} }
@@ -1331,9 +1330,10 @@ boolean ghostly;
/* rest_worm(fd); */ /* restore worm information */ /* rest_worm(fd); */ /* restore worm information */
rest_worm(nhfp); /* restore worm information */ rest_worm(nhfp); /* restore worm information */
g.ftrap = 0; g.ftrap = 0;
keepgoing = TRUE; for (;;) {
while (trap = newtrap(), keepgoing) { trap = newtrap();
if (nhfp->structlevel) if (nhfp->structlevel)
mread(nhfp->fd, (genericptr_t)trap, sizeof(struct trap)); mread(nhfp->fd, (genericptr_t)trap, sizeof(struct trap));
if (nhfp->fieldlevel) if (nhfp->fieldlevel)
@@ -1342,9 +1342,10 @@ boolean ghostly;
trap->ntrap = g.ftrap; trap->ntrap = g.ftrap;
g.ftrap = trap; g.ftrap = trap;
} else } else
keepgoing = FALSE; break;
} }
dealloc_trap(trap); dealloc_trap(trap);
fobj = restobjchn(nhfp, ghostly, FALSE); fobj = restobjchn(nhfp, ghostly, FALSE);
find_lev_obj(); find_lev_obj();
/* restobjchn()'s `frozen' argument probably ought to be a callback /* restobjchn()'s `frozen' argument probably ought to be a callback