Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crash fix for AvatarManager when iterating over _avatarHash

Browse source 
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID().  When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d) will *insert*
an empty smart_ptr into the hash.
This commit is contained in:
Anthony J. Thibault 2015-10-30 16:13:04 -07:00
parent 710b51fe14
commit 085282db4f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/avatar/AvatarManager.cpp
View file

@ -366,5 +366,10 @@ AvatarSharedPointer AvatarManager::getAvatarBySessionID(const QUuid& sessionID)
return std::static_pointer_cast<Avatar>(_myAvatar); return std::static_pointer_cast<Avatar>(_myAvatar);
} }
QReadLocker locker(&_hashLock); QReadLocker locker(&_hashLock);
return _avatarHash[sessionID]; auto iter = _avatarHash.find(sessionID);
if (iter != _avatarHash.end()) {
return iter.value();
} else {
return AvatarSharedPointer();
}
} }