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

Merging fix of bug/empty-json-parsing-failure #622

Merged
yviter merged 3 commits from bug/empty-json-parsing-failure into develop 2021-12-07 17:40:30 +00:00
Conversation 9 Commits 3 Files changed 1 +9 -5
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
View file

@ -834,15 +834,17 @@ rpc_client::rpc_client(const std::string &url, const std::string &user_name, con
} }
std::string rpc_client::retrieve_array_value_from_reply(std::string reply_str, std::string array_path, uint32_t idx) { std::string rpc_client::retrieve_array_value_from_reply(std::string reply_str, std::string array_path, uint32_t idx) {
if (reply_str.empty())
return std::string();
std::stringstream ss(reply_str); std::stringstream ss(reply_str);
boost::property_tree::ptree json; boost::property_tree::ptree json;
boost::property_tree::read_json(ss, json); boost::property_tree::read_json(ss, json);
if (json.find("result") == json.not_found()) { if (json.find("result") == json.not_found()) {
return ""; return std::string();
} }
auto json_result = json.get_child("result"); auto json_result = json.get_child("result");
if (json_result.find(array_path) == json_result.not_found()) { if (json_result.find(array_path) == json_result.not_found()) {
return ""; return std::string();
} }
boost::property_tree::ptree array_ptree = json_result; boost::property_tree::ptree array_ptree = json_result;
@ -859,19 +861,21 @@ std::string rpc_client::retrieve_array_value_from_reply(std::string reply_str, s
} }
} }
return ""; return std::string();
} }
std::string rpc_client::retrieve_value_from_reply(std::string reply_str, std::string value_path) { std::string rpc_client::retrieve_value_from_reply(std::string reply_str, std::string value_path) {
if (reply_str.empty())
return std::string();
std::stringstream ss(reply_str); std::stringstream ss(reply_str);
boost::property_tree::ptree json; boost::property_tree::ptree json;
boost::property_tree::read_json(ss, json); boost::property_tree::read_json(ss, json);
if (json.find("result") == json.not_found()) { if (json.find("result") == json.not_found()) {
return ""; return std::string();
} }
auto json_result = json.get_child("result"); auto json_result = json.get_child("result");
if (json_result.find(value_path) == json_result.not_found()) { if (json_result.find(value_path) == json_result.not_found()) {
return ""; return std::string();
} }
return json_result.get<std::string>(value_path); return json_result.get<std::string>(value_path);
} }