Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved temporary memory class

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-28 18:07:01 +00:00
parent e58c9de067
commit d8b276b7e2
3 changed files with 78 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
libretroshare/src/dbase/findex.cc
View File

@ -22,6 +22,7 @@
*/ */
#include <util/rswin.h> #include <util/rswin.h>
#include <util/rsmemory.h>
#include "dbase/findex.h" #include "dbase/findex.h"
#include "retroshare/rsexpr.h" #include "retroshare/rsexpr.h"
#include "util/rsdir.h" #include "util/rsdir.h"
@ -767,69 +768,72 @@ int FileIndex::loadIndex(const std::string& filename, const RsFileHash& expected
return 0; return 0;
} }
/* load file into memory, close file */ std::string s ;
uint8_t *compressed_data = new uint8_t[size] ;
if(!compressed_data)
{ {
std::cerr << "FileIndex::loadIndex(): can't allocate memory for " << size << " bytes." << std::endl; /* load file into memory, close file */
RsTemporaryMemory compressed_data(size) ;
if(!compressed_data)
{
std::cerr << "FileIndex::loadIndex(): can't allocate memory for " << size << " bytes." << std::endl;
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;
fclose(file);
return 0;
}
fclose(file); 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;
fclose(file);
delete[] compressed_data;
return 0;
}
fclose(file);
RsFileHash tmpout = RsDirUtil::sha1sum((unsigned char *)(compressed_data),size); RsFileHash tmpout = RsDirUtil::sha1sum((unsigned char *)(compressed_data),size);
// /* calculate hash */ // /* calculate hash */
// unsigned char sha_buf[SHA_DIGEST_LENGTH]; // unsigned char sha_buf[SHA_DIGEST_LENGTH];
// SHA_CTX *sha_ctx = new SHA_CTX; // SHA_CTX *sha_ctx = new SHA_CTX;
// SHA1_Init(sha_ctx); // SHA1_Init(sha_ctx);
// SHA1_Update(sha_ctx, s.c_str(), s.length()); // SHA1_Update(sha_ctx, s.c_str(), s.length());
// SHA1_Final(&sha_buf[0], sha_ctx); // SHA1_Final(&sha_buf[0], sha_ctx);
// delete sha_ctx; // delete sha_ctx;
// //
// std::string tmpout; // std::string tmpout;
// for(int i = 0; i < SHA_DIGEST_LENGTH; ++i) // for(int i = 0; i < SHA_DIGEST_LENGTH; ++i)
// { // {
// rs_sprintf_append(tmpout, "%02x", (unsigned int) (sha_buf[i])); // rs_sprintf_append(tmpout, "%02x", (unsigned int) (sha_buf[i]));
// } // }
if (!expectedHash.isNull() && expectedHash != tmpout) if (!expectedHash.isNull() && expectedHash != tmpout)
{ {
#ifdef FI_DEBUG #ifdef FI_DEBUG
std::cerr << "FileIndex::loadIndex expected hash does not match" << std::endl; std::cerr << "FileIndex::loadIndex expected hash does not match" << std::endl;
std::cerr << "Expected hash: " << expectedHash << std::endl; std::cerr << "Expected hash: " << expectedHash << std::endl;
std::cerr << "Hash found: " << tmpout << std::endl; std::cerr << "Hash found: " << tmpout << std::endl;
#endif #endif
return 0; return 0;
}
// now uncompress the string
//
uint8_t *uncompressed_data = NULL ;
unsigned int uncompressed_data_size = 0 ;
if(!RsCompress::uncompress_memory_chunk(compressed_data,size,uncompressed_data,uncompressed_data_size))
{
std::cerr << "FileIndex::loadIndex() Decompression failed! Fileindex can't be read." << std::endl;
return 0 ;
}
s = std::string((char *)uncompressed_data,uncompressed_data_size) ;
std::cerr << " file = " << filename << std::endl;
std::cerr << " uncompressed size = " << uncompressed_data_size << std::endl;
std::cerr << " compressed size = " << size << std::endl;
std::cerr << " hash = " << tmpout << std::endl;
free(uncompressed_data) ;
} }
// now uncompress the string
//
uint8_t *uncompressed_data = NULL ;
unsigned int uncompressed_data_size = 0 ;
if(!RsCompress::uncompress_memory_chunk(compressed_data,size,uncompressed_data,uncompressed_data_size))
{
std::cerr << "FileIndex::loadIndex() Decompression failed! Fileindex can't be read." << std::endl;
return 0 ;
}
std::string s((char *)uncompressed_data,uncompressed_data_size) ;
std::cerr << " file = " << filename << std::endl;
std::cerr << " uncompressed size = " << uncompressed_data_size << std::endl;
std::cerr << " compressed size = " << size << std::endl;
std::cerr << " hash = " << tmpout << std::endl;
delete[] compressed_data ;
free(uncompressed_data) ;
#define FIND_NEXT(s,start,end,c) end = s.find(c, start); if (end == std::string::npos) end = s.length(); #define FIND_NEXT(s,start,end,c) end = s.find(c, start); if (end == std::string::npos) end = s.length();

7
libretroshare/src/grouter/p3grouter.cc
View File

@ -922,9 +922,8 @@ bool p3GRouter::sendDataInTunnel(const TurtleVirtualPeerId& vpid,RsGRouterAbstra
#endif #endif
uint32_t size = item->serial_size(); uint32_t size = item->serial_size();
unsigned char *data = NULL ;
TemporaryMemoryHolder f(data,size) ; // data will be freed on return, whatever the route taken. RsTemporaryMemory data(size) ; // data will be freed on return, whatever the route taken.
if(data == NULL) if(data == NULL)
{ {
@ -1384,9 +1383,7 @@ bool p3GRouter::verifySignedDataItem(RsGRouterAbstractMsgItem *item)
RsTlvSecurityKey signature_key ; RsTlvSecurityKey signature_key ;
uint32_t data_size = item->signed_data_size() ; uint32_t data_size = item->signed_data_size() ;
uint8_t *data = NULL; RsTemporaryMemory data(data_size) ;
TemporaryMemoryHolder f(data,data_size) ;
if(data == NULL) if(data == NULL)
throw std::runtime_error("Cannot allocate data.") ; throw std::runtime_error("Cannot allocate data.") ;

24
libretroshare/src/util/rsmemory.h
View File

@ -8,22 +8,28 @@
// Usage: // Usage:
// //
// { // {
// unsigned char *mem = NULL ; // TemporaryMemoryHolder mem(size) ;
// TemporaryMemoryHolder mem_holder(mem,size) ; //
// if(mem != NULL)
// [ do something ] ;
//
// memcopy(mem, some_other_memory, size) ;
// //
// [do something] // [do something]
//
// } // mem gets freed automatically // } // mem gets freed automatically
// //
class TemporaryMemoryHolder class RsTemporaryMemory
{ {
public: public:
TemporaryMemoryHolder(unsigned char *& mem,size_t s) RsTemporaryMemory(size_t s)
: _mem(mem)
{ {
_mem = (unsigned char *)malloc(s) ; _mem = (unsigned char *)malloc(s) ;
} }
~TemporaryMemoryHolder() operator unsigned char *() { return _mem ; }
~RsTemporaryMemory()
{ {
if(_mem != NULL) if(_mem != NULL)
{ {
@ -33,7 +39,11 @@ class TemporaryMemoryHolder
} }
private: private:
unsigned char *& _mem ; unsigned char *_mem ;
// make it noncopyable
RsTemporaryMemory& operator=(const RsTemporaryMemory&) { return *this ;}
RsTemporaryMemory(const RsTemporaryMemory&) {}
}; };