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

Fixed some memory leaks when config could not be loaded/saved.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5294 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-07-13 22:10:52 +00:00
parent fc8dfcf65b
commit 7e226558e4
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretroshare/src/pqi/p3cfgmgr.cc
View File

@ -310,6 +310,11 @@ bool p3ConfigMgr::backedUpFileSave(const std::string& fname, const std::string&
<< fname_backup << " to " << fname << std::endl << fname_backup << " to " << fname << std::endl
<< sign_fname_backup << " to " << sign_fname << std::endl; << sign_fname_backup << " to " << sign_fname << std::endl;
#endif #endif
if (config_buff)
delete[] config_buff;
if (sign_buff)
delete[] sign_buff;
return true; return true;
} }
@ -323,6 +328,9 @@ bool p3ConfigMgr::backedUpFileSave(const std::string& fname, const std::string&
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
std::cerr << "p3Config::backedUpFileSave() fopen failed for file: " << fname_backup << std::endl; std::cerr << "p3Config::backedUpFileSave() fopen failed for file: " << fname_backup << std::endl;
#endif #endif
delete[] config_buff;
delete[] sign_buff;
return true; return true;
} }
@ -755,7 +763,10 @@ bool p3Config::loadAttempt(const std::string& cfgFname,const std::string& signFn
BinMemInterface *signbio = new BinMemInterface(1000, BIN_FLAGS_READABLE); BinMemInterface *signbio = new BinMemInterface(1000, BIN_FLAGS_READABLE);
if(!signbio->readfromfile(signFname.c_str())) if(!signbio->readfromfile(signFname.c_str()))
{
delete signbio;
return false; return false;
}
std::string signatureStored((char *) signbio->memptr(), signbio->memsize()); std::string signatureStored((char *) signbio->memptr(), signbio->memsize());
@ -763,11 +774,11 @@ bool p3Config::loadAttempt(const std::string& cfgFname,const std::string& signFn
std::string strHash(Hash()); std::string strHash(Hash());
AuthSSL::getAuthSSL()->SignData(strHash.c_str(), strHash.length(), signatureRead); AuthSSL::getAuthSSL()->SignData(strHash.c_str(), strHash.length(), signatureRead);
delete signbio;
if(signatureRead != signatureStored) if(signatureRead != signatureStored)
return false; return false;
delete signbio;
return true; return true;
} }
@ -884,6 +895,7 @@ bool p3Config::getHashAttempt(const std::string& loadHash, std::string& hashstr,
setHash(""); setHash("");
delete stream;
return false; return false;
} }
@ -1125,6 +1137,7 @@ bool p3Config::backedUpFileSave(const std::string& cfg_fname, const std::string&
{ {
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "Write error", "Error while writing backup configuration file " + cfg_fname_backup + "\nIs your disc full or out of quota ?"); getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "Write error", "Error while writing backup configuration file " + cfg_fname_backup + "\nIs your disc full or out of quota ?");
fclose(cfg_file); fclose(cfg_file);
delete[] buff;
return false ; return false ;
} }

7
libretroshare/src/pqi/pqibin.cc
View File

@ -237,13 +237,18 @@ int BinEncryptedFileInterface::readdata(void* data, int len)
if(-1 == BinFileInterface::readdata(encryptedData, encrypDataLen)) if(-1 == BinFileInterface::readdata(encryptedData, encrypDataLen))
{
delete[] encryptedData;
return -1; return -1;
}
if((encrypDataLen > 0) && (encryptedData != NULL)) if((encrypDataLen > 0) && (encryptedData != NULL))
{ {
if(!AuthSSL::getAuthSSL()->decrypt((void*&)(this->data), sizeData, encryptedData, encrypDataLen)) if(!AuthSSL::getAuthSSL()->decrypt((void*&)(this->data), sizeData, encryptedData, encrypDataLen))
{
delete[] encryptedData;
return -1; return -1;
}
haveData = true; haveData = true;
delete[] encryptedData; delete[] encryptedData;

6
libretroshare/src/pqi/pqistore.cc
View File

@ -391,15 +391,17 @@ bool pqiSSLstore::encryptedSendItems(const std::list<RsItem*>& rsItemList)
delete *it; delete *it;
} }
bool result = true;
if(sizeItems == offset) if(sizeItems == offset)
enc_bio->senddata(data, sizeItems); enc_bio->senddata(data, sizeItems);
else else
return false; result = false;
if(data != NULL) if(data != NULL)
delete[] data; delete[] data;
return true; return result;
} }
bool pqiSSLstore::getEncryptedItems(std::list<RsItem* >& rsItemList) bool pqiSSLstore::getEncryptedItems(std::list<RsItem* >& rsItemList)