From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 18 Mar 2015 19:40:54 +0000 (+0200)
Subject: Prevent segfault, water_damage may get a NULL obj
X-Git-Tag: NetHack-3.6.0_RC01~589
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e93add8cb8e0ed782ec6da0beebf4d18d5c6f59a;p=nethack

Prevent segfault, water_damage may get a NULL obj
---

diff --git a/src/trap.c b/src/trap.c
index 36c1ee632..bc8f0c746 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -3159,6 +3159,8 @@ boolean force;
 {
 	boolean exploded = FALSE;
 
+	if (!obj) return ER_NOTHING;
+
         if (snuff_lit(obj))
             return ER_DAMAGED;