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

suppressed possible SIGSEGV due to null information in certificate

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-02-09 08:37:01 +00:00
parent d5dbe6bd38
commit a84d1e37fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -708,6 +708,7 @@ bool AuthGPG::DoOwnSignature_locked(const void *data, unsigned int datalen, void
if (len < *outl) // -1 because we added a 0 at the end. if (len < *outl) // -1 because we added a 0 at the end.
{ {
fprintf(stderr,"Length is smaller. Reducing to %d\n",len) ;
*outl = len; *outl = len;
} }
memmove(buf_sigout, export_sig, *outl); memmove(buf_sigout, export_sig, *outl);
@ -1111,14 +1112,13 @@ std::string AuthGPG::SaveCertificateToString(std::string id)
{ {
std::cerr << "Error export Data" << std::endl; std::cerr << "Error export Data" << std::endl;
} }
gpgme_data_write (gpgmeData, "", 1); // to be able to convert it into a string
fflush (NULL); fflush (NULL);
//showData (gpgmeData); //showData (gpgmeData);
size_t len = 0; size_t len = 0;
char *export_txt = gpgme_data_release_and_get_mem(gpgmeData, &len); char *export_txt = gpgme_data_release_and_get_mem(gpgmeData, &len);
tmp = std::string(export_txt); tmp = std::string(export_txt,len);
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
std::cerr << "Exported Certificate: " << std::endl << tmp << std::endl; std::cerr << "Exported Certificate: " << std::endl << tmp << std::endl;
@ -1160,6 +1160,10 @@ bool AuthGPG::LoadCertificateFromString(std::string str, std::string &gpg_id)
gpgme_import_result_t res = gpgme_op_import_result(CTX); gpgme_import_result_t res = gpgme_op_import_result(CTX);
if(res->imports == NULL)
return false ;
std::string fingerprint = std::string(res->imports->fpr); std::string fingerprint = std::string(res->imports->fpr);
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
std::cerr << "AuthGPG::LoadCertificateFromString() Importing considered folowing fpr : " << fingerprint << std::endl; std::cerr << "AuthGPG::LoadCertificateFromString() Importing considered folowing fpr : " << fingerprint << std::endl;