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

null pointer dereference in do_name.c

Browse Source 
fixes #534
This commit is contained in:
nhmall
2021-06-15 15:49:31 -04:00
parent 57e970b227
commit 5ac913e035
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes37.0
+2
View File
@@ -713,6 +713,8 @@ enlightenment/disclosure when wielding two weapons with two-weap skill higher
than secondary weapon's skill had "with" duplicated in the feedback than secondary weapon's skill had "with" duplicated in the feedback
corpse of monster with gender specific names (king vs queen and so forth) corpse of monster with gender specific names (king vs queen and so forth)
was always described by the neutral name (ruler and such) was always described by the neutral name (ruler and such)
prevent obj_pmname() from calling mon_pmname(&monst) when monst->data is null
to prevent a null pointer dereference
curses: 'msg_window' option wasn't functional for curses unless the binary curses: 'msg_window' option wasn't functional for curses unless the binary
also included tty support also included tty support
src/do_name.c
+1 -1
View File
@@ -2098,7 +2098,7 @@ mon_pmname(struct monst *mon)
const char * const char *
obj_pmname(struct obj *obj) obj_pmname(struct obj *obj)
{ {
if (has_omonst(obj)) if (has_omonst(obj) && OMONST(obj)->data)
return mon_pmname(OMONST(obj)); return mon_pmname(OMONST(obj));
if ((obj->otyp == CORPSE || obj->otyp == STATUE || obj->otyp == FIGURINE) if ((obj->otyp == CORPSE || obj->otyp == STATUE || obj->otyp == FIGURINE)