Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-31 18:29:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed two instances of malloc(0) captured by new rs_malloc funtion

Browse source
This commit is contained in:
csoler 2016-01-12 21:43:04 -05:00
parent d13526facd
commit d55993d1e4
35 changed files with 73 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/ft/ftcontroller.cc
View file

@ -748,7 +748,7 @@ bool ftController::copyFile(const std::string& source,const std::string& dest)
size_t T=0;
static const int BUFF_SIZE = 10485760 ; // 10 MB buffer to speed things up.
void *buffer = rs_safe_malloc(BUFF_SIZE) ;
void *buffer = rs_malloc(BUFF_SIZE) ;
if(buffer == NULL)
{

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

@ -879,7 +879,7 @@ bool ftDataMultiplex::locked_handleServerRequest(ftFileProvider *provider, const
std::cerr << "Warning: peer " << peerId << " is asking a large chunk (s=" << chunksize << ") for hash " << hash << ", filesize=" << size << ". This is unexpected." << std::endl ;
return false ;
}
void *data = rs_safe_malloc(chunksize);
void *data = rs_malloc(chunksize);
if(data == NULL)
return false ;

2
libretroshare/src/ft/ftserver.cc
View file

@ -1102,7 +1102,7 @@ bool ftServer::sendData(const RsPeerId& peerId, const RsFileHash& hash, uint64_t
item->chunk_offset = offset+baseoffset ;
item->chunk_size = chunk;
item->chunk_data = rs_safe_malloc(chunk) ;
item->chunk_data = rs_malloc(chunk) ;
if(item->chunk_data == NULL)
{

2
libretroshare/src/ft/ftturtlefiletransferitem.cc
View file

@ -436,7 +436,7 @@ RsTurtleFileDataItem::RsTurtleFileDataItem(void *data,uint32_t pktsize)
if(chunk_size > rssize || rssize - chunk_size < offset)
throw std::runtime_error("RsTurtleFileDataItem::() error while deserializing.") ;
chunk_data = (void*)rs_safe_malloc(chunk_size) ;
chunk_data = (void*)rs_malloc(chunk_size) ;
if(chunk_data == NULL)
throw std::runtime_error("RsTurtleFileDataItem::() cannot allocate memory.") ;