From 47c194fd564993cb8047bfcb2265db2c0dd2b2c8 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 1 Dec 2022 13:29:52 +0200
Subject: [PATCH] Avoid segfault when null obj passed to water_damage

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

diff --git a/src/trap.c b/src/trap.c
index f7c0e1496..fe17ae208 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -4117,6 +4117,7 @@ acid_damage(struct obj* obj)
 }
 
 /* Get an object wet and damage it appropriately.
+ *   "obj": if null, returns ER_NOTHING
  *   "ostr", if present, is used instead of the object name in some
  *     messages.
  *   "force" means not to roll luck to protect some objects.
@@ -4128,7 +4129,7 @@ water_damage(
     const char *ostr,
     boolean force)
 {
-    boolean in_invent = carried(obj), described = FALSE;
+    boolean in_invent = obj && carried(obj), described = FALSE;
 
     if (!obj)
         return ER_NOTHING;