From: Pasi Kallinen Date: Sun, 16 Feb 2020 09:22:18 +0000 (+0200) Subject: Prevent segfault in can_blnd X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f76aba4d7fc65dfad9b15107892de4c1f59e2a8c;p=nethack Prevent segfault in can_blnd --- diff --git a/src/mondata.c b/src/mondata.c index 9f09f411b..4ee2a6ffe 100644 --- a/src/mondata.c +++ b/src/mondata.c @@ -182,7 +182,9 @@ struct monst *mon; } /* True iff monster can be blinded by the given attack; - note: may return True when mdef is blind (e.g. new cream-pie attack) */ + note: may return True when mdef is blind (e.g. new cream-pie attack) + magr can be NULL. +*/ boolean can_blnd(magr, mdef, aatyp, obj) struct monst *magr; /* NULL == no specific aggressor */ @@ -203,7 +205,7 @@ struct obj *obj; /* aatyp == AT_WEAP, AT_SPIT */ a saying expressed in Latin rather than a zoological observation: "a crow will not pluck out the eye of another crow" so prevent ravens from blinding each other */ - if (magr->data == &mons[PM_RAVEN] && mdef->data == &mons[PM_RAVEN]) + if (magr && magr->data == &mons[PM_RAVEN] && mdef->data == &mons[PM_RAVEN]) return FALSE; switch (aatyp) {