Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2778 

c957795b fix output_stream_header memory leak (MaxXor)
This commit is contained in:
Riccardo Spagni 2017-11-15 11:40:38 +02:00
parent 3abd6f1fd0 c957795bfa
commit cd070874bf
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/blockchain_utilities/bootstrap_file.cpp
View File

@ -134,8 +134,7 @@ bool BootstrapFile::initialize_file()
bbi.block_last_pos = 0; bbi.block_last_pos = 0;
buffer_type buffer2; buffer_type buffer2;
boost::iostreams::stream<boost::iostreams::back_insert_device<buffer_type>>* output_stream_header; boost::iostreams::stream<boost::iostreams::back_insert_device<buffer_type>> output_stream_header(buffer2);
output_stream_header = new boost::iostreams::stream<boost::iostreams::back_insert_device<buffer_type>>(buffer2);
uint32_t bd_size = 0; uint32_t bd_size = 0;
@ -147,8 +146,8 @@ bool BootstrapFile::initialize_file()
{ {
throw std::runtime_error("Error in serialization of bootstrap::file_info size"); throw std::runtime_error("Error in serialization of bootstrap::file_info size");
} }
*output_stream_header << blob; output_stream_header << blob;
*output_stream_header << bd; output_stream_header << bd;
bd = t_serializable_object_to_blob(bbi); bd = t_serializable_object_to_blob(bbi);
MDEBUG("bootstrap::blocks_info size: " << bd.size()); MDEBUG("bootstrap::blocks_info size: " << bd.size());
@ -158,12 +157,12 @@ bool BootstrapFile::initialize_file()
{ {
throw std::runtime_error("Error in serialization of bootstrap::blocks_info size"); throw std::runtime_error("Error in serialization of bootstrap::blocks_info size");
} }
*output_stream_header << blob; output_stream_header << blob;
*output_stream_header << bd; output_stream_header << bd;
output_stream_header->flush(); output_stream_header.flush();
*output_stream_header << std::string(header_size-buffer2.size(), 0); // fill in rest with null bytes output_stream_header << std::string(header_size-buffer2.size(), 0); // fill in rest with null bytes
output_stream_header->flush(); output_stream_header.flush();
std::copy(buffer2.begin(), buffer2.end(), std::ostreambuf_iterator<char>(*m_raw_data_file)); std::copy(buffer2.begin(), buffer2.end(), std::ostreambuf_iterator<char>(*m_raw_data_file));
return true; return true;