Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

attempt at fixing leak sources in channel messages

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2011-04-25 09:58:19 +00:00
parent 478f145728
commit 660d5d8e58
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretroshare/src/services/p3distrib.cc
View File

@ -2004,6 +2004,9 @@ void p3GroupDistrib::locked_publishPendingMsgs()
resave = true; resave = true;
} }
// prevent sending original source of message to peers
(*it)->PeerId(mOwnId);
if(!store->SendItem(*it)) /* deletes it */ if(!store->SendItem(*it)) /* deletes it */
{ {
ok &= false; ok &= false;
@ -2077,6 +2080,7 @@ void p3GroupDistrib::publishDistribGroups()
std::string tmpname = out.str(); std::string tmpname = out.str();
std::string filename = path + "/" + tmpname; std::string filename = path + "/" + tmpname;
std::string filenametmp = path + "/" + tmpname + ".tmp"; std::string filenametmp = path + "/" + tmpname + ".tmp";
std::string tempPeerId; // to store actual id temporarily
BinInterface *bio = new BinFileInterface(filenametmp.c_str(), BIN_FLAGS_WRITEABLE | BIN_FLAGS_HASH_DATA); BinInterface *bio = new BinFileInterface(filenametmp.c_str(), BIN_FLAGS_WRITEABLE | BIN_FLAGS_HASH_DATA);
pqistore *store = createStore(bio, mOwnId, BIN_FLAGS_NO_DELETE | BIN_FLAGS_WRITEABLE); pqistore *store = createStore(bio, mOwnId, BIN_FLAGS_NO_DELETE | BIN_FLAGS_WRITEABLE);
@ -2102,7 +2106,10 @@ void p3GroupDistrib::publishDistribGroups()
if (grp) if (grp)
{ {
/* store in Cache File */ /* store in Cache File */
tempPeerId = grp->PeerId();
grp->PeerId(mOwnId); // prevent sending original source to users
store->SendItem(grp); /* no delete */ store->SendItem(grp); /* no delete */
grp->PeerId(tempPeerId);
grp->grpFlags &= (~RS_DISTRIB_UPDATE); // if this is an update, ensure flag is removed after publication grp->grpFlags &= (~RS_DISTRIB_UPDATE); // if this is an update, ensure flag is removed after publication
} }