From ebc1902f26ae41d40edf8366ff2886262aa2b0bb Mon Sep 17 00:00:00 2001 From: Matthew Duggan Date: Tue, 3 Nov 2020 13:49:29 +0900 Subject: [PATCH] ULTIMA8: Avoid a potential null ptr deref --- engines/ultima/ultima8/graphics/anim_dat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/graphics/anim_dat.cpp index 10a8c9f8dab..d254949519a 100644 --- a/engines/ultima/ultima8/graphics/anim_dat.cpp +++ b/engines/ultima/ultima8/graphics/anim_dat.cpp @@ -69,7 +69,7 @@ uint32 AnimDat::getActionNumberForSequence(Animation::Sequence action, const Act bool isavatar = (actor && actor->getShape() == 1); if (isavatar && actor->getActiveWeapon()) { const Item *wpn = getItem(actor->getActiveWeapon()); - const ShapeInfo *shapeinfo = wpn->getShapeInfo(); + const ShapeInfo *shapeinfo = (wpn ? wpn->getShapeInfo() : nullptr); const WeaponInfo *wpninfo = (shapeinfo ? shapeinfo->_weaponInfo : nullptr); smallwpn = (wpninfo && wpninfo->_small); altfire = (wpninfo && (wpninfo->_overlayShape == 0x36e || wpninfo->_overlayShape == 0x33b));