From e93add8cb8e0ed782ec6da0beebf4d18d5c6f59a Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Wed, 18 Mar 2015 21:40:54 +0200
Subject: [PATCH] Prevent segfault, water_damage may get a NULL obj

---
 src/trap.c | 2 ++
 1 file changed, 2 insertions(+)

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;