ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ULTIMA8: Avoid a potential null ptr deref

Browse Source
This commit is contained in:
Matthew Duggan
2020-11-17 08:43:55 +09:00
parent 8dfc5f64fc
commit ebc1902f26
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/ultima/ultima8/graphics/anim_dat.cpp
+1 -1
View File
@@ -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));