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

Avoid segfault when null obj passed to water_damage

Browse Source
This commit is contained in:
Pasi Kallinen
2022-12-01 13:29:52 +02:00
parent 2f09bcba31
commit 47c194fd56
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/trap.c
View File

@@ -4117,6 +4117,7 @@ acid_damage(struct obj* obj)
} }
/* Get an object wet and damage it appropriately. /* 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 * "ostr", if present, is used instead of the object name in some
* messages. * messages.
* "force" means not to roll luck to protect some objects. * "force" means not to roll luck to protect some objects.
@@ -4128,7 +4129,7 @@ water_damage(
const char *ostr, const char *ostr,
boolean force) boolean force)
{ {
boolean in_invent = carried(obj), described = FALSE; boolean in_invent = obj && carried(obj), described = FALSE;
if (!obj) if (!obj)
return ER_NOTHING; return ER_NOTHING;