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

Fix for use-after-free in supply chest generation

Browse Source
This commit is contained in:
Alex Smith
2023-12-03 00:49:45 +00:00
parent 6c38bfeba2
commit fe2d8faed9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mklev.c
View File

@@ -938,6 +938,7 @@ fill_ordinary_room(struct mkroom *croom, boolean bonus_items)
supply_chest->olocked = !!(rn2(6)); supply_chest->olocked = !!(rn2(6));
int tryct = 0; int tryct = 0;
boolean cursed;
do { do {
int otyp; int otyp;
/* 50% this is a potion of healing */ /* 50% this is a potion of healing */
@@ -960,6 +961,7 @@ fill_ordinary_room(struct mkroom *croom, boolean bonus_items)
otmp = mksobj(otyp, TRUE, FALSE); otmp = mksobj(otyp, TRUE, FALSE);
if (otyp == POT_HEALING && rn2(2)) if (otyp == POT_HEALING && rn2(2))
otmp->quan = 2; otmp->quan = 2;
cursed = otmp->cursed;
add_to_container(supply_chest, otmp); add_to_container(supply_chest, otmp);
++tryct; ++tryct;
@@ -971,7 +973,7 @@ fill_ordinary_room(struct mkroom *croom, boolean bonus_items)
probability of more; if we generate a cursed item, it's probability of more; if we generate a cursed item, it's
added to the supply chest but we reroll for a noncursed added to the supply chest but we reroll for a noncursed
item and add that too */ item and add that too */
} while (otmp->cursed || !rn2(5)); } while (cursed || !rn2(5));
/* maybe put a random item into the supply chest, biased /* maybe put a random item into the supply chest, biased
slightly towards low-level spellbooks; avoid tools slightly towards low-level spellbooks; avoid tools