From ca2a524a5f0ba297415ce50ee7b82e2933483f16 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Wed, 13 Nov 2019 14:50:42 +0400 Subject: [PATCH] Avoid null pointer dereference --- apps/openmw/mwrender/npcanimation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index cde3b3041..abc2583d5 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -539,7 +539,7 @@ std::string NpcAnimation::getShieldMesh(MWWorld::ConstPtr shield) const { const ESM::BodyPart *bodypart = 0; bodypart = partStore.search(bodypartName); - if (bodypart->mData.mType != ESM::BodyPart::MT_Armor) + if (bodypart == nullptr || bodypart->mData.mType != ESM::BodyPart::MT_Armor) return ""; else if (!bodypart->mModel.empty()) mesh = "meshes\\" + bodypart->mModel;