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

Prevent segfault when looking around inside monster

Browse Source 
A recent change by me introduced a segfault when
counting swallowed hero as a monster inventory item.
This commit is contained in:
Pasi Kallinen
2015-04-15 17:06:39 +03:00
parent 647a072b62
commit e77ea2ae61
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pickup.c
View File

@@ -708,7 +708,7 @@ menu_item **pick_list; /* return list of items picked */
int how; /* type of query */ int how; /* type of query */
boolean FDECL((*allow), (OBJ_P));/* allow function */ boolean FDECL((*allow), (OBJ_P));/* allow function */
{ {
int i, n; int i, n, actualn;
winid win; winid win;
struct obj *curr, *last, fake_hero_object; struct obj *curr, *last, fake_hero_object;
struct obj **oarray; struct obj **oarray;
@@ -727,7 +727,7 @@ boolean FDECL((*allow), (OBJ_P));/* allow function */
last = curr; last = curr;
n++; n++;
} }
actualn = n;
if (engulfer) { if (engulfer) {
++n; ++n;
/* don't autoselect swallowed hero if it's the only choice */ /* don't autoselect swallowed hero if it's the only choice */
@@ -744,7 +744,7 @@ boolean FDECL((*allow), (OBJ_P));/* allow function */
return 1; return 1;
} }
oarray = objarr_init(n); oarray = objarr_init(actualn);
/* Add objects to the array */ /* Add objects to the array */
i = 0; i = 0;
for (curr = olist; curr; curr = FOLLOW(curr, qflags)) { for (curr = olist; curr; curr = FOLLOW(curr, qflags)) {
@@ -767,7 +767,7 @@ boolean FDECL((*allow), (OBJ_P));/* allow function */
pack = flags.inv_order; pack = flags.inv_order;
do { do {
printed_type_name = FALSE; printed_type_name = FALSE;
for (i = 0; i < n; i++) { for (i = 0; i < actualn; i++) {
curr = oarray[i]; curr = oarray[i];
if ((qflags & FEEL_COCKATRICE) && curr->otyp == CORPSE && if ((qflags & FEEL_COCKATRICE) && curr->otyp == CORPSE &&
will_feel_cockatrice(curr, FALSE)) { will_feel_cockatrice(curr, FALSE)) {