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

AuthGPG: fixed some memory leaks in case of gpg error

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-06-25 14:38:38 +00:00
parent e175f0fb87
commit 825ba0af79
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/pqi/authgpg.cc
View File

@ -377,6 +377,7 @@ bool AuthGPG::storeAllKeys_locked()
// if (rsicontrol != NULL) { // if (rsicontrol != NULL) {
// rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list."); // rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list.");
// } // }
gpgme_set_keylist_mode(CTX, origmode);
return false; return false;
} else { } else {
//let's start a new list //let's start a new list
@ -731,6 +732,8 @@ bool AuthGPG::DoOwnSignature_locked(const void *data, unsigned int datalen, void
{ {
ProcessPGPmeError(ERR); ProcessPGPmeError(ERR);
std::cerr << "AuthGPG::Sign FAILED ERR: " << ERR << std::endl; std::cerr << "AuthGPG::Sign FAILED ERR: " << ERR << std::endl;
gpgme_data_release(gpgmeSig);
gpgme_data_release(gpgmeData);
return false; return false;
} }
@ -841,6 +844,8 @@ bool AuthGPG::VerifySignature_locked(const void *data, int datalen, const void *
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
fprintf(stderr, "VerifySignature Failed to get Result\n"); fprintf(stderr, "VerifySignature Failed to get Result\n");
#endif #endif
gpgme_data_release(gpgmeData);
gpgme_data_release(gpgmeSig);
return false ; return false ;
} }
@ -1247,14 +1252,17 @@ bool AuthGPG::LoadCertificateFromString(std::string str, std::string &gpg_id)
if (GPG_ERR_NO_ERROR != gpgme_op_import (CTX,gpgmeData)) if (GPG_ERR_NO_ERROR != gpgme_op_import (CTX,gpgmeData))
{ {
std::cerr << "AuthGPG::LoadCertificateFromString() Error Importing Certificate" << std::endl; std::cerr << "AuthGPG::LoadCertificateFromString() Error Importing Certificate" << std::endl;
gpgme_data_release (gpgmeData);
return false ; return false ;
} }
gpgme_import_result_t res = gpgme_op_import_result(CTX); gpgme_import_result_t res = gpgme_op_import_result(CTX);
if(res == NULL || res->imports == NULL) if(res == NULL || res->imports == NULL) {
gpgme_data_release (gpgmeData);
return false ; return false ;
}
fingerprint = std::string(res->imports->fpr); fingerprint = std::string(res->imports->fpr);
#ifdef GPG_DEBUG #ifdef GPG_DEBUG