stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed double-delete in some rare situations in User::handleDisconnect

Browse source
This commit is contained in:
Jan Kaluza 2011-07-19 13:18:32 +02:00
parent b59b762d5f
commit 3450eb8796
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/user.cpp
View file

@ -191,8 +191,12 @@ void User::handleDisconnected(const std::string &error) {
// so we can't removeUser() in server mode, because it would be removed twice.
// Once in finishSession and once in m_userManager->removeUser.
if (m_component->inServerMode()) {
// Remove user later just to be sure there won't be double-free.
// We can't be sure finishSession sends unavailable presence everytime, so check if user gets removed
// in finishSession(...) call and if not, remove it here.
std::string jid = m_jid.toBare().toString();
dynamic_cast<Swift::ServerStanzaChannel *>(m_component->getStanzaChannel())->finishSession(m_jid, boost::shared_ptr<Swift::Element>(new Swift::StreamError()));
if (!m_connected) {
if (m_userManager->getUser(jid) != NULL) {
m_userManager->removeUser(this);
}
}