From cbe42f969b4cbbf2de75325b588f304e519c76c3 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 14 Nov 2023 01:05:04 -0800 Subject: [PATCH] Obj_SuperFlickyOwner: check valid before returning source - Flicky::source() dereferences a pointer --- src/objects/super-flicky.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/super-flicky.cpp b/src/objects/super-flicky.cpp index d78de32fd..601ccdf7e 100644 --- a/src/objects/super-flicky.cpp +++ b/src/objects/super-flicky.cpp @@ -765,7 +765,7 @@ mobj_t *Obj_SuperFlickyOwner(const mobj_t* mobj) { const Flicky* x = static_cast(mobj); - return x->source(); + return x->valid() ? x->source() : nullptr; } boolean Obj_IsSuperFlickyWhippable(const mobj_t* mobj) @@ -780,4 +780,4 @@ boolean Obj_IsSuperFlickyTargettingYou(const mobj_t* mobj, mobj_t *player) const Flicky* x = static_cast(mobj); return player == x->chasing(); -} \ No newline at end of file +}