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

Fix segfault when farlooking monster under generic object

Browse Source 
A detected cave spider was hiding under a generic spellbook object;
farlooking at it produced a segfault.  OBJ_NAME is null for the generic
objects, so don't try to strcmp it.
This commit is contained in:
Pasi Kallinen
2023-02-04 17:48:57 +02:00
parent d515538f21
commit e1b01a5d7c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objnam.c
+1 -1
View File
@@ -2139,7 +2139,7 @@ ansimpleoname(struct obj* obj)
any `known' and `dknown' checking necessary) */ any `known' and `dknown' checking necessary) */
if (otyp == FAKE_AMULET_OF_YENDOR) if (otyp == FAKE_AMULET_OF_YENDOR)
otyp = AMULET_OF_YENDOR; otyp = AMULET_OF_YENDOR;
if (objects[otyp].oc_unique if (objects[otyp].oc_unique && OBJ_NAME(objects[otyp])
&& !strcmp(simpleoname, OBJ_NAME(objects[otyp]))) { && !strcmp(simpleoname, OBJ_NAME(objects[otyp]))) {
/* the() will allocate another obuf[]; we want to avoid using two */ /* the() will allocate another obuf[]; we want to avoid using two */
Strcpy(simpleoname, obufp = the(simpleoname)); Strcpy(simpleoname, obufp = the(simpleoname));