Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-22 05:14:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed extra delete after storeGroup and storeMessage

Browse source
This commit is contained in:
csoler 2020-12-30 21:41:47 +01:00
parent 4916c3925f
commit 637d5f360a
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/gxs/rsgenexchange.cc
View file

@ -2380,15 +2380,15 @@ void RsGenExchange::publishMsgs()
if(rsPeers) if(rsPeers)
mRoutingClues[msg->metaData->mAuthorId].insert(rsPeers->getOwnId()) ; mRoutingClues[msg->metaData->mAuthorId].insert(rsPeers->getOwnId()) ;
computeHash(msg->msg, msg->metaData->mHash); computeHash(msg->msg, msg->metaData->mHash); // (csoler) weird choice: hash should also depend on metadata. Fortunately, msg signature
mDataAccess->addMsgData(msg); // signs the holw thing (msg + meta)
mPublishedMsgs[token] = *msg->metaData; mPublishedMsgs[token] = *msg->metaData;
RsGxsMsgItem *msg_item = dynamic_cast<RsGxsMsgItem*>(mSerialiser->deserialise(msg->msg.bin_data,&msg->msg.bin_len)) ; RsGxsMsgItem *msg_item = dynamic_cast<RsGxsMsgItem*>(mSerialiser->deserialise(msg->msg.bin_data,&msg->msg.bin_len)) ;
msg_item->meta = *msg->metaData; msg_item->meta = *msg->metaData;
delete msg ; mDataAccess->addMsgData(msg); // msg is deleted by addMsgData()
msgChangeMap[grpId].push_back(msg_item); msgChangeMap[grpId].push_back(msg_item);
@ -2819,7 +2819,6 @@ void RsGenExchange::publishGrps()
else else
mDataAccess->addGroupData(grp); mDataAccess->addGroupData(grp);
delete grp ;
groups_to_subscribe.push_back(grpId) ; groups_to_subscribe.push_back(grpId) ;
} }
else else
@ -3343,8 +3342,7 @@ void RsGenExchange::performUpdateValidation()
#ifdef GEN_EXCH_DEBUG #ifdef GEN_EXCH_DEBUG
std::cerr << "RsGenExchange::performUpdateValidation() " << std::endl; std::cerr << "RsGenExchange::performUpdateValidation() " << std::endl;
#endif #endif
std::list<RsNxsGrp*> grps; // dont use RsNxsGrpDataTemporaryList because updateGrps will delete the groups
RsNxsGrpDataTemporaryList grps ;
for(auto vit(mGroupUpdates.begin()); vit != mGroupUpdates.end(); ++vit) for(auto vit(mGroupUpdates.begin()); vit != mGroupUpdates.end(); ++vit)
{ {