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

Impossible instead of segfault in cursed

Browse Source 
While fuzz testing, I've seen segfault a handful of times in here,
coming from do_takeoff(). Looks like context.takeoff.what is stale,
having WORN_BLINDF, but we're not wearing the blindfold anymore.

Haven't been able to trace it down yet, so guard it with impossible.
This commit is contained in:
Pasi Kallinen
2016-12-12 17:42:02 +02:00
parent 2655910a0f
commit 86df94b281
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/do_wear.c
View File

@@ -1484,6 +1484,10 @@ int
cursed(otmp) cursed(otmp)
register struct obj *otmp; register struct obj *otmp;
{ {
if (!otmp) {
impossible("cursed without otmp");
return 0;
}
/* Curses, like chickens, come home to roost. */ /* Curses, like chickens, come home to roost. */
if ((otmp == uwep) ? welded(otmp) : (int) otmp->cursed) { if ((otmp == uwep) ? welded(otmp) : (int) otmp->cursed) {
boolean use_plural = (is_boots(otmp) || is_gloves(otmp) boolean use_plural = (is_boots(otmp) || is_gloves(otmp)