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

Removed memory leak in cleanUpCertificate when the certificate can't be cleaned.

Browse Source 
Switched from char* to std::string, because the char* is unnecessary and wasn't freed on some returns.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3368 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-08-14 11:51:15 +00:00
parent 358c425986
commit c4167ba0ac
1 changed files with 22 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
libretroshare/src/pqi/cleanupxpgp.cc
View File

@ -46,7 +46,7 @@ std::string cleanUpCertificate(std::string badCertificate)
Buffer for storing the cleaned certificate. In certain cases the
cleanCertificate can be larger than the badCertificate
*/
char * cleanCertificate=new char[badCertificate.length()+100];
std::string cleanCertificate;
//The entire certificate begin tag
const char * beginCertTag="-----BEGIN";
//The entire certificate end tag
@ -71,8 +71,6 @@ std::string cleanUpCertificate(std::string badCertificate)
size_t endCertEndIdx=0;
//The length of the bad certificate.
size_t lengthOfCert=badCertificate.length();
//The current index value in the cleaned certificate.
size_t currCleanCertIdx=0;
//The current index value in the bad certificate
size_t currBadCertIdx=0;
//Temporary index value
@ -171,12 +169,7 @@ std::string cleanUpCertificate(std::string badCertificate)
/*
Copying the begin tag(-----BEGIN) to the clean certificate
*/
for(size_t i=0;i<strlen(beginCertTag);i++)
{
cleanCertificate[currCleanCertIdx+i]=beginCertTag[i];
}
currCleanCertIdx=currCleanCertIdx+strlen(beginCertTag);
cleanCertificate += beginCertTag;
currBadCertIdx=beginCertStartIdx2+strlen(beginTag);
/*
Copying the name of the tag e.g XPGP CERTIFICATE. At the same time remove any white spaces and new line
@ -194,28 +187,22 @@ std::string cleanUpCertificate(std::string badCertificate)
}
else
{
cleanCertificate[currCleanCertIdx]=badCertificate[currBadCertIdx];
currCleanCertIdx++;
cleanCertificate += badCertificate[currBadCertIdx];
currBadCertIdx++;
}
}
/*
If the last character is a space we need to remove it.
*/
if(cleanCertificate[currCleanCertIdx-1]==' ')
if(cleanCertificate.substr(cleanCertificate.length()-1, 1) == " ")
{
currCleanCertIdx--;
cleanCertificate.erase(cleanCertificate.length()-1);
}
/*
Copying the end part of the certificate start tag(-----).
*/
for(size_t i=0;i<strlen(commonTag);i++)
{
cleanCertificate[currCleanCertIdx]='-';
currCleanCertIdx++;
}
cleanCertificate[currCleanCertIdx]='\n';
currCleanCertIdx++;
cleanCertificate += commonTag;
cleanCertificate += "\n";
currBadCertIdx=currBadCertIdx+strlen(commonTag);
/*
Remove the white spaces between the end of the certificate begin tag and the actual
@ -227,16 +214,14 @@ std::string cleanUpCertificate(std::string badCertificate)
}
//keep the first line : gnupg version
cleanCertificate[currCleanCertIdx]= badCertificate[currBadCertIdx];
cleanCertificate += badCertificate[currBadCertIdx];
currBadCertIdx++;
while(badCertificate[currBadCertIdx]!='\n')
{
cleanCertificate[currCleanCertIdx]= badCertificate[currBadCertIdx];
currCleanCertIdx++;
cleanCertificate += badCertificate[currBadCertIdx];
currBadCertIdx++;
}
cleanCertificate[currCleanCertIdx]= badCertificate[currBadCertIdx];
currCleanCertIdx++;
cleanCertificate += badCertificate[currBadCertIdx];
currBadCertIdx++;
//Start of the actual certificate. Remove spaces in the certificate
@ -247,8 +232,7 @@ std::string cleanUpCertificate(std::string badCertificate)
{
if(cntPerLine==64)
{
cleanCertificate[currCleanCertIdx]='\n';
currCleanCertIdx++;
cleanCertificate += "\n";
cntPerLine=0;
continue;
}
@ -262,17 +246,15 @@ std::string cleanUpCertificate(std::string badCertificate)
currBadCertIdx++;
continue;
}
cleanCertificate[currCleanCertIdx]=badCertificate[currBadCertIdx];
cleanCertificate += badCertificate[currBadCertIdx];
cntPerLine++;
currCleanCertIdx++;
currBadCertIdx++;
}
if(cleanCertificate[currCleanCertIdx-1]!='\n')
if(cleanCertificate.substr(cleanCertificate.length()-1,1)!="\n")
{
cleanCertificate[currCleanCertIdx]='\n';
currCleanCertIdx++;
// std::cerr<<"zeeeee"<<std::endl;
cleanCertificate += "\n";
// std::cerr<<"zeeeee"<<std::endl;
}
else
{
@ -282,12 +264,7 @@ std::string cleanUpCertificate(std::string badCertificate)
Copying the begining part of the certificate end tag. Copying
-----END part of the tag.
*/
for(size_t i=0;i<strlen(endCertTag);i++)
{
cleanCertificate[currCleanCertIdx+i]=endCertTag[i];
}
currCleanCertIdx=currCleanCertIdx+strlen(endCertTag);
cleanCertificate += endCertTag;
currBadCertIdx=endCertStartIdx2+strlen(endTag);
/*
Copying the name of the certificate e.g XPGP CERTIFICATE. The end tag also has the
@ -305,8 +282,7 @@ std::string cleanUpCertificate(std::string badCertificate)
}
else
{
cleanCertificate[currCleanCertIdx]=badCertificate[currBadCertIdx];
currCleanCertIdx++;
cleanCertificate += badCertificate[currBadCertIdx];
currBadCertIdx++;
}
@ -314,35 +290,17 @@ std::string cleanUpCertificate(std::string badCertificate)
/*
If the last character is a space we need to remove it.
*/
if(cleanCertificate[currCleanCertIdx-1]==' ')
if(cleanCertificate.substr(cleanCertificate.length()-1,1)==" ")
{
currCleanCertIdx--;
cleanCertificate.erase(cleanCertificate.length()-1);
}
/*
Copying the end part(-----) of the end tag in the certificate.
*/
for(size_t i=0;i<strlen(commonTag);i++)
{
cleanCertificate[currCleanCertIdx]='-';
currCleanCertIdx++;
}
cleanCertificate[currCleanCertIdx]='\n';
currCleanCertIdx++;
/*
Copying over the cleaned certificate to a new buffer.
*/
char * cleanCert=new char[currCleanCertIdx+1];
for(size_t i=0;i<currCleanCertIdx;i++ )
{
cleanCert[i]=cleanCertificate[i];
}
cleanCert[currCleanCertIdx]='\0';
std::string cleanCertificateStr=cleanCert;
delete[] cleanCertificate;
delete[] cleanCert;
cleanCertificate += commonTag;
cleanCertificate += "\n";
return cleanCertificateStr;
return cleanCertificate;
}
int findEndIdxOfCertStartTag(std::string badCertificate)