Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix Witness/Sons multiple IDs reading from config file

Browse source 
- Reading witness-ids, son-ids properties crashed in Release build
This commit is contained in:
serkixenos 2020-11-03 16:45:33 +01:00
parent 99c8c2dd51
commit 2eea4676b2
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
View file

@ -138,8 +138,10 @@ void peerplays_sidechain_plugin_impl::plugin_initialize(const boost::program_opt
config_ready_son = (options.count("son-id") || options.count("son-ids")) && options.count("peerplays-private-key"); config_ready_son = (options.count("son-id") || options.count("son-ids")) && options.count("peerplays-private-key");
if (config_ready_son) { if (config_ready_son) {
LOAD_VALUE_SET(options, "son-id", sons, chain::son_id_type) LOAD_VALUE_SET(options, "son-id", sons, chain::son_id_type)
if (options.count("son-ids")) if (options.count("son-ids")) {
boost::insert(sons, fc::json::from_string(options.at("son-ids").as<string>()).as<vector<chain::son_id_type>>(5)); vector<chain::son_id_type> v = fc::json::from_string(options.at("son-ids").as<string>()).as<vector<chain::son_id_type>>(5);
sons.insert(v.begin(), v.end());
}
config_ready_son = config_ready_son && !sons.empty(); config_ready_son = config_ready_son && !sons.empty();
#ifndef ENABLE_MULTIPLE_SONS #ifndef ENABLE_MULTIPLE_SONS

6
libraries/plugins/witness/witness.cpp
View file

@ -91,8 +91,10 @@ void witness_plugin::plugin_initialize(const boost::program_options::variables_m
ilog("witness plugin: plugin_initialize() begin"); ilog("witness plugin: plugin_initialize() begin");
_options = &options; _options = &options;
LOAD_VALUE_SET(options, "witness-id", _witnesses, chain::witness_id_type) LOAD_VALUE_SET(options, "witness-id", _witnesses, chain::witness_id_type)
if (options.count("witness-ids")) if (options.count("witness-ids")) {
boost::insert(_witnesses, fc::json::from_string(options.at("witness-ids").as<string>()).as<vector<chain::witness_id_type>>( 5 )); vector<chain::witness_id_type> v = fc::json::from_string(options.at("witness-ids").as<string>()).as<vector<chain::witness_id_type>>( 5 );
_witnesses.insert(v.begin(), v.end());
}
if( options.count("private-key") ) if( options.count("private-key") )
{ {