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

fixed memory leak in PGPHandler

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-04-01 20:25:33 +00:00
parent c3cd166f45
commit cef22a35f9
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libretroshare/src/pgp/pgphandler.cc
View File

@ -963,6 +963,8 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
{ {
std::cerr << "Loaded certificate contains more than one PGP key. This is not allowed." << std::endl; std::cerr << "Loaded certificate contains more than one PGP key. This is not allowed." << std::endl;
error_string = "Loaded certificate contains more than one PGP key. This is not allowed." ; error_string = "Loaded certificate contains more than one PGP key. This is not allowed." ;
ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ;
return false ; return false ;
} }
@ -974,6 +976,8 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
{ {
error_string = "Public key is not version 4. Rejected!" ; error_string = "Public key is not version 4. Rejected!" ;
std::cerr << "Received a key with unhandled version number (" << keydata->key.pkey.version << ")" << std::endl; std::cerr << "Received a key with unhandled version number (" << keydata->key.pkey.version << ")" << std::endl;
ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ;
return false ; return false ;
} }
@ -985,6 +989,8 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
{ {
std::cerr << "Cannot validate self-signature for this certificate. Format error?" << std::endl; std::cerr << "Cannot validate self-signature for this certificate. Format error?" << std::endl;
error_string = "Cannot validate self signature for this certificate. Format error?" ; error_string = "Cannot validate self signature for this certificate. Format error?" ;
ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ;
return false ; return false ;
} }
@ -1002,6 +1008,8 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
error_string = "This key is not self-signed. This is required by Retroshare." ; error_string = "This key is not self-signed. This is required by Retroshare." ;
std::cerr << "This key is not self-signed. This is required by Retroshare." << std::endl; std::cerr << "This key is not self-signed. This is required by Retroshare." << std::endl;
ops_validate_result_free(result); ops_validate_result_free(result);
ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ;
return false ; return false ;
} }
ops_validate_result_free(result); ops_validate_result_free(result);
@ -1027,7 +1035,11 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,PGPIdType
if(tmp_keyring->nkeys > 0) if(tmp_keyring->nkeys > 0)
id = PGPIdType(tmp_keyring->keys[0].key_id) ; id = PGPIdType(tmp_keyring->keys[0].key_id) ;
else else
{
ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ;
return false ; return false ;
}
ops_keyring_free(tmp_keyring) ; ops_keyring_free(tmp_keyring) ;
free(tmp_keyring) ; free(tmp_keyring) ;