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 memory leak/missing fclose. Patch from Vaio

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-09-09 17:11:37 +00:00
parent 7c43bd27d3
commit b83a1f18d8
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libretroshare/src/dbase/findex.cc
View file

@ -769,21 +769,23 @@ int FileIndex::loadIndex(const std::string& filename, const RsFileHash& expected
/* load file into memory, close file */
uint8_t *compressed_data = new uint8_t[size] ;
if(compressed_data == NULL)
if(!compressed_data)
{
std::cerr << "FileIndex::loadIndex(): can't allocate memory for " << size << " bytes." << std::endl;
return 0 ;
fclose(file);
return 0;
}
int bytesread = 0 ;
if(size != (bytesread = fread(compressed_data,1,size,file)))
{
std::cerr << "FileIndex::loadIndex(): can't read " << size << " bytes from file " << filename << ". Only " << bytesread << " actually read." << std::endl;
return 0 ;
fclose(file);
delete[] compressed_data;
return 0;
}
fclose(file) ;
fclose(file);
RsFileHash tmpout = RsDirUtil::sha1sum((unsigned char *)(compressed_data),size);
RsFileHash tmpout = RsDirUtil::sha1sum((unsigned char *)(compressed_data),size);
// /* calculate hash */
// unsigned char sha_buf[SHA_DIGEST_LENGTH];