Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-22 05:14:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

this is a fix for the file download problem. It does not correct the wrong chunk size, but it checks that the malloc returns something.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-07-27 20:31:56 +00:00
parent 9834ef5cbf
commit c9467a2bfe
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/ft/ftdatamultiplex.cc
View file

@ -415,6 +415,11 @@ bool ftDataMultiplex::locked_handleServerRequest(ftFileProvider *provider,
{ {
void *data = malloc(chunksize); void *data = malloc(chunksize);
if(data == NULL)
{
std::cerr << "WARNING: Could not allocate data for a chunksize of " << chunksize << std::endl ;
return false ;
}
#ifdef MPLEX_DEBUG #ifdef MPLEX_DEBUG
std::cerr << "ftDataMultiplex::locked_handleServerRequest()"; std::cerr << "ftDataMultiplex::locked_handleServerRequest()";
std::cerr << "\t peer: " << peerId << " hash: " << hash; std::cerr << "\t peer: " << peerId << " hash: " << hash;

9
libretroshare/src/ft/ftfileprovider.cc
View file

@ -101,6 +101,15 @@ bool ftFileProvider::getFileData(uint64_t offset, uint32_t &chunk_size, void *da
if (data_size > 0) if (data_size > 0)
{ {
if(data == NULL)
{
std::cerr << "ftFileProvider: Warning ! Re-allocating data, which probably could not be allocated because of weird chunk size." << std::endl ;
if(NULL == (data = malloc(data_size)))
{
std::cerr << "ftFileProvider: Could not malloc a size of " << data_size << std::endl ;
return false;
}
}
/* /*
* seek for base_loc * seek for base_loc
*/ */