From bd0eb5fde3c408c6e66a80101c38edd605528380 Mon Sep 17 00:00:00 2001
From: Nicholaz Beresford
Date: Wed, 17 Sep 2008 02:16:50 -0500
Subject: VWR-2683: Possible crash accessing dead llviewerregion.
---
linden/indra/newview/llfloateractivespeakers.cpp | 4 ++--
linden/indra/newview/llviewerobjectlist.cpp | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
(limited to 'linden')
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index ed2f9f8..9aa21d5 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1342,7 +1342,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
for(avatar_it = LLCharacter::sInstances.begin(); avatar_it != LLCharacter::sInstances.end(); ++avatar_it)
{
LLVOAvatar* avatarp = (LLVOAvatar*)*avatar_it;
- if (dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
+ if (!avatarp->isDead() && dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
{
setSpeaker(avatarp->getID());
}
@@ -1356,7 +1356,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
if (speakerp->mStatus == LLSpeaker::STATUS_TEXT_ONLY)
{
LLVOAvatar* avatarp = (LLVOAvatar*)gObjectList.findObject(speaker_id);
- if (!avatarp || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
+ if (!avatarp || avatarp->isDead() || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
{
speakerp->mStatus = LLSpeaker::STATUS_NOT_IN_CHANNEL;
speakerp->mDotColor = INACTIVE_COLOR;
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index bd8ed97..dec7ced 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -859,6 +859,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
if (objectp->mRegionp == regionp)
{
killObject(objectp);
+
+ // invalidate region pointer. region will become invalid, but
+ // refcounted objects may survive the cleanDeadObjects() call below
+ objectp->mRegionp = NULL;
}
}
--
cgit v1.1