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

- Fixed crash because of a memory overwrite

Browse source 
The static arrays in RsDiscSpace were to small for RS_PGP_DIRECTORY (0x0003)
  Added new constant RS_DIRECTORY_COUNT
- Added missing fclose to PGPHandler::encryptTextToFile
  Used ops_teardown_file_write instead of ops_writer_close and ops_create_info_delete
  Windows cannot move a file when it is still open

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6542 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-07-26 23:12:09 +00:00
parent b84930b157
commit e95725ea2c
4 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libretroshare/src/pgp/pgphandler.cc
View file

@ -1059,11 +1059,6 @@ bool PGPHandler::encryptTextToFile(const PGPIdType& key_id,const std::string& te
{
RsStackMutex mtx(pgphandlerMtx) ; // lock access to PGP memory structures.
std::string outfile_tmp = outfile + ".tmp" ;
ops_create_info_t *info;
int fd = ops_setup_file_write(&info, outfile_tmp.c_str(), ops_true);
const ops_keydata_t *public_key = locked_getPublicKey(key_id,true) ;
if(public_key == NULL)
@ -1078,15 +1073,20 @@ bool PGPHandler::encryptTextToFile(const PGPIdType& key_id,const std::string& te
return false ;
}
if (fd < 0)
std::string outfile_tmp = outfile + ".tmp" ;
ops_create_info_t *info;
int fd = ops_setup_file_write(&info, outfile_tmp.c_str(), ops_true);
if (fd < 0)
{
std::cerr << "PGPHandler::encryptTextToFile(): ERROR: Cannot write to " << outfile_tmp << std::endl;
return false ;
}
ops_encrypt_stream(info, public_key, NULL, ops_false, ops_true);
ops_write(text.c_str(), text.length(), info);
ops_writer_close(info);
ops_create_info_delete(info);
ops_teardown_file_write(info, fd);
if(!RsDirUtil::renameFile(outfile_tmp,outfile))
{