Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed call of deleted pointer in std::map (patch from Vaio)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-09-09 18:10:52 +00:00
parent 6bfe653330
commit 28b11a555a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libretroshare/src/pqi/p3historymgr.cc
View File

@ -461,20 +461,24 @@ void p3HistoryMgr::removeMessages(const std::list<uint32_t> &msgIds)
std::list<uint32_t> removedIds;
std::list<uint32_t>::iterator iit;
std::cerr << "********** p3History::removeMessages called()" << std::endl;
std::cerr << "********** p3History::removeMessages called()" << std::endl;
{
RsStackMutex stack(mHistoryMtx); /********** STACK LOCKED MTX ******/
std::map<RsPeerId, std::map<uint32_t, RsHistoryMsgItem*> >::iterator mit;
for (mit = mMessages.begin(); mit != mMessages.end(); ++mit) {
for (mit = mMessages.begin(); mit != mMessages.end(); ++mit)
{
iit = ids.begin();
while (iit != ids.end()) {
while ( !ids.empty() || (iit != ids.end()) )
{
std::map<uint32_t, RsHistoryMsgItem*>::iterator lit = mit->second.find(*iit);
if (lit != mit->second.end()) {
if (lit != mit->second.end())
{
std::cerr << "**** Removing " << mit->first << " msg id = " << lit->first << std::endl;
delete(lit->second);
mit->second.erase(lit);
std::cerr << "**** Removing " << mit->first << " msg id = " << lit->first << std::endl;
removedIds.push_back(*iit);
iit = ids.erase(iit);
@ -483,19 +487,15 @@ void p3HistoryMgr::removeMessages(const std::list<uint32_t> &msgIds)
++iit;
}
if (ids.empty()) {
break;
}
}
}
if (removedIds.empty() == false) {
if (!removedIds.empty())
{
IndicateConfigChanged();
for (iit = removedIds.begin(); iit != removedIds.end(); ++iit) {
for (iit = removedIds.begin(); iit != removedIds.end(); ++iit)
RsServer::notify()->notifyHistoryChanged(*iit, NOTIFY_TYPE_DEL);
}
}
}