OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix unsafe cleanup in ~plCameraRegionDetector

Browse Source 
Deleting an hsRefCnt is evil, we should ALWAYS hsRefCnt_SafeUnRef (we
might have a nullptr) it because someone might ref it. hsRefCnt will explictly crash if you delete it when the refcnt != 1.

Also, take this opportunity to vector-ize things.
This commit is contained in:
Adam Johnson
2012-02-11 17:25:11 -05:00
parent 8ec1a92359
commit 9795b4e7fc
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.cpp
View File

@ -236,13 +236,8 @@ void plCollisionDetector::Write(hsStream* stream, hsResMgr* mgr)
plCameraRegionDetector::~plCameraRegionDetector()
{
for(int i = 0; i < fMessages.Count(); i++)
{
plMessage* pMsg = fMessages[i];
fMessages.Remove(i);
delete(pMsg);
}
fMessages.SetCountAndZero(0);
for (plCameraMsgVec::iterator it = fMessages.begin(); it != fMessages.end(); ++it)
hsRefCnt_SafeUnRef(*it);
}
void plCameraRegionDetector::ITrigger(plKey hitter, bool entering, bool immediate)
@ -314,7 +309,7 @@ void plCameraRegionDetector::ISendSavedTriggerMsgs()
{
if (fSavingSendMsg)
{
for (int i = 0; i < fMessages.Count(); i++)
for (size_t i = 0; i < fMessages.size(); ++i)
{
char str[256];
@ -322,13 +317,13 @@ void plCameraRegionDetector::ISendSavedTriggerMsgs()
if (fSavedMsgEnterFlag)
{
fMessages[i]->SetCmd(plCameraMsg::kEntering);
sprintf(str, "Entering cameraRegion: %s - Evals=%d -msg %d of %d\n", GetKeyName().c_str(),fNumEvals,i+1,fMessages.Count());
sprintf(str, "Entering cameraRegion: %s - Evals=%d -msg %d of %d\n", GetKeyName().c_str(),fNumEvals,i+1,fMessages.size());
fIsInside = true;
}
else
{
fMessages[i]->ClearCmd(plCameraMsg::kEntering);
sprintf(str, "Exiting cameraRegion: %s - Evals=%d -msg %d of %d\n", GetKeyName().c_str(),fNumEvals,i+1,fMessages.Count());
sprintf(str, "Exiting cameraRegion: %s - Evals=%d -msg %d of %d\n", GetKeyName().c_str(),fNumEvals,i+1,fMessages.size());
fIsInside = false;
}
plgDispatch::MsgSend(fMessages[i]);
@ -372,8 +367,8 @@ void plCameraRegionDetector::Read(hsStream* stream, hsResMgr* mgr)
{
plDetectorModifier::Read(stream, mgr);
int n = stream->ReadLE32();
fMessages.SetCountAndZero(n);
for(int i = 0; i < n; i++ )
fMessages.resize(n);
for(size_t i = 0; i < n; i++ )
{
plCameraMsg* pMsg = plCameraMsg::ConvertNoRef(mgr->ReadCreatable(stream));
fMessages[i] = pMsg;
@ -383,9 +378,9 @@ void plCameraRegionDetector::Read(hsStream* stream, hsResMgr* mgr)
void plCameraRegionDetector::Write(hsStream* stream, hsResMgr* mgr)
{
plDetectorModifier::Write(stream, mgr);
stream->WriteLE32(fMessages.GetCount());
for(int i = 0; i < fMessages.GetCount(); i++ )
mgr->WriteCreatable( stream, fMessages[i] );
stream->WriteLE32(fMessages.size());
for(plCameraMsgVec::iterator it = fMessages.begin(); it != fMessages.end(); ++it)
mgr->WriteCreatable( stream, *it );
}
void plCameraRegionDetector::IHandleEval(plEvalMsg *pEval)

6
Sources/Plasma/PubUtilLib/plPhysical/plCollisionDetector.h
View File

@ -177,7 +177,9 @@ public:
class plCameraRegionDetector : public plObjectInVolumeDetector
{
protected:
hsTArray<plCameraMsg*> fMessages;
typedef std::vector<plCameraMsg*> plCameraMsgVec;
plCameraMsgVec fMessages;
bool fIsInside;
bool fSavingSendMsg;
bool fSavedMsgEnterFlag;
@ -193,7 +195,7 @@ public:
~plCameraRegionDetector();
virtual hsBool MsgReceive(plMessage* msg);
void AddMessage(plCameraMsg* pMsg) { fMessages.Append(pMsg); }
void AddMessage(plCameraMsg* pMsg) { fMessages.push_back(pMsg); }
CLASSNAME_REGISTER( plCameraRegionDetector );
GETINTERFACE_ANY( plCameraRegionDetector, plCollisionDetector );