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

sortloot memory leak

Browse Source 
Unfreed memory noticed after interrupting the fuzzer and quitting.
query_objlist() has an early return--for touching a cockatrice
corpse--that was skipping release of sortloot info (an array with
one element per object from whichever object list was being used).

Some formatting that's been sitting around for a while got mixed in
and I decided not to take that back out.
This commit is contained in:
PatR
2019-05-29 04:40:54 -07:00
parent 3427d1ce85
commit 1a35c15588
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes36.3
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.26 $ $NHDT-Date: 1559088523 2019/05/29 00:08:43 $
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.27 $ $NHDT-Date: 1559130050 2019/05/29 11:40:50 $
This fixes36.3 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -32,6 +32,7 @@ if hero dies while a thrown or kicked object is in transit, put that object
on the map in case bones data gets saved
fix a memory leak that occurred if player used wizard mode to leave and return
to the Plane of Air or Plane of Water (not possible in normal play)
free sortloot data if object handling is short-circuited by cockatrice corpse
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

16
src/pickup.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pickup.c $NHDT-Date: 1545785547 2018/12/26 00:52:27 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.222 $ */
/* NetHack 3.6 pickup.c $NHDT-Date: 1559130050 2019/05/29 11:40:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.226 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -187,7 +187,7 @@ int *menu_on_demand;
const char *where = 0;
char sym, oc_of_sym, *p;
ask_again:
ask_again:
oclasses[oclassct = 0] = '\0';
*one_at_a_time = *everything = FALSE;
not_everything = filtered = FALSE;
@@ -586,7 +586,7 @@ int what; /* should be a long */
&pick_list, PICK_ANY, all_but_uchain);
}
menu_pickup:
menu_pickup:
n_tried = n;
for (n_picked = i = 0; i < n; i++) {
res = pickup_object(pick_list[i].item.a_obj, pick_list[i].count,
@@ -690,7 +690,7 @@ int what; /* should be a long */
break;
n_picked += res;
}
end_query:
end_query:
; /* statement required after label */
}
@@ -899,6 +899,7 @@ boolean FDECL((*allow), (OBJ_P)); /* allow function */
&& will_feel_cockatrice(curr, FALSE)) {
destroy_nhwindow(win); /* stop the menu and revert */
(void) look_here(0, FALSE);
unsortloot(&sortedolist);
return 0;
}
if ((*allow)(curr)) {
@@ -1938,8 +1939,7 @@ reverse_loot()
if (g_at(x, y))
pline("Ok, now there is loot here.");
} else {
/* find original coffers chest if present, otherwise use nearest one
*/
/* find original coffers chest if present, otherwise use nearest one */
otmp = 0;
for (coffers = fobj; coffers; coffers = coffers->nobj)
if (coffers->otyp == CHEST) {
@@ -2569,7 +2569,7 @@ boolean more_containers; /* True iff #loot multiple and this isn't last one */
* or
* <The/Your/Shk's container> is empty. Do what with it? [:irs nq or ?]
*/
for (;;) { /* repeats iff '?' or ":' gets chosen */
for (;;) { /* repeats iff '?' or ':' gets chosen */
outmaybe = (outokay || !current_container->cknown);
if (!outmaybe)
(void) safe_qbuf(qbuf, (char *) 0, " is empty. Do what with it?",
@@ -2697,7 +2697,7 @@ boolean more_containers; /* True iff #loot multiple and this isn't last one */
}
}
containerdone:
containerdone:
if (used) {
/* Not completely correct; if we put something in without knowing
whatever was already inside, now we suddenly do. That can't