teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix potentially unsafe use of MWWorld::Ptr

Browse source
This commit is contained in:
scrawl 2014-05-17 02:52:10 +02:00
parent e5a21aca53
commit 9adb990143
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -6,6 +6,7 @@
#include "../mwworld/manualref.hpp" #include "../mwworld/manualref.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/inventorystore.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwbase/world.hpp" #include "../mwbase/world.hpp"
@ -96,7 +97,7 @@ namespace MWWorld
{ {
ProjectileState state; ProjectileState state;
state.mActorId = actor.getClass().getCreatureStats(actor).getActorId(); state.mActorId = actor.getClass().getCreatureStats(actor).getActorId();
state.mBow = bow; state.mBowId = bow.getCellRef().mRefID;
state.mVelocity = orient.yAxis() * speed; state.mVelocity = orient.yAxis() * speed;
state.mProjectileId = projectile.getCellRef().mRefID; state.mProjectileId = projectile.getCellRef().mRefID;
@ -217,17 +218,28 @@ namespace MWWorld
if (obstacle == caster) if (obstacle == caster)
continue; continue;
if (caster.isEmpty())
caster = obstacle;
if (obstacle.isEmpty()) if (obstacle.isEmpty())
{ {
// Terrain // Terrain
} }
else if (obstacle.getClass().isActor()) else if (obstacle.getClass().isActor())
{ {
MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mProjectileId); MWWorld::ManualRef projectileRef(MWBase::Environment::get().getWorld()->getStore(), it->mProjectileId);
MWMechanics::projectileHit(caster, obstacle, it->mBow, projectileRef.getPtr(), pos + (newPos - pos) * cIt->first);
// Try to get a Ptr to the bow that was used. It might no longer exist.
MWWorld::Ptr bow = projectileRef.getPtr();
if (!caster.isEmpty())
{
MWWorld::InventoryStore& inv = caster.getClass().getInventoryStore(caster);
MWWorld::ContainerStoreIterator invIt = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedRight);
if (invIt != inv.end() && Misc::StringUtils::ciEqual(invIt->getCellRef().mRefID, it->mBowId))
bow = *invIt;
}
if (caster.isEmpty())
caster = obstacle;
MWMechanics::projectileHit(caster, obstacle, bow, projectileRef.getPtr(), pos + (newPos - pos) * cIt->first);
} }
hit = true; hit = true;
} }

3
apps/openmw/mwworld/projectilemanager.hpp
View file

@ -84,7 +84,8 @@ namespace MWWorld
// RefID of the projectile // RefID of the projectile
std::string mProjectileId; std::string mProjectileId;
MWWorld::Ptr mBow; // bow or crossbow the projectile was fired from (may be empty) // RefID of the bow or crossbow the actor was using when this projectile was fired (may be empty)
std::string mBowId;
Ogre::Vector3 mVelocity; Ogre::Vector3 mVelocity;
}; };