nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rpc: do not try to use an invalid txid in relay_tx

Browse Source
This commit is contained in:
moneromooo-monero 2017-12-07 21:33:20 +00:00
parent 1cc7451130
commit 490a5d41ca
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rpc/core_rpc_server.cpp
View File

@ -1436,19 +1436,25 @@ namespace cryptonote
{ {
failed = true; failed = true;
} }
else
{
crypto::hash txid = *reinterpret_cast<const crypto::hash*>(txid_data.data()); crypto::hash txid = *reinterpret_cast<const crypto::hash*>(txid_data.data());
txids.push_back(txid); txids.push_back(txid);
} }
} }
}
if (!m_core.get_blockchain_storage().flush_txes_from_pool(txids)) if (!m_core.get_blockchain_storage().flush_txes_from_pool(txids))
{ {
res.status = "Failed to remove one more tx"; res.status = "Failed to remove one or more tx(es)";
return false; return false;
} }
if (failed) if (failed)
{ {
if (txids.empty())
res.status = "Failed to parse txid"; res.status = "Failed to parse txid";
else
res.status = "Failed to parse some of the txids";
return false; return false;
} }
@ -1705,13 +1711,16 @@ namespace cryptonote
PERF_TIMER(on_relay_tx); PERF_TIMER(on_relay_tx);
bool failed = false; bool failed = false;
res.status = "";
for (const auto &str: req.txids) for (const auto &str: req.txids)
{ {
cryptonote::blobdata txid_data; cryptonote::blobdata txid_data;
if(!epee::string_tools::parse_hexstr_to_binbuff(str, txid_data)) if(!epee::string_tools::parse_hexstr_to_binbuff(str, txid_data))
{ {
res.status = std::string("Invalid transaction id: ") + str; if (!res.status.empty()) res.status += ", ";
res.status += std::string("invalid transaction id: ") + str;
failed = true; failed = true;
continue;
} }
crypto::hash txid = *reinterpret_cast<const crypto::hash*>(txid_data.data()); crypto::hash txid = *reinterpret_cast<const crypto::hash*>(txid_data.data());
@ -1727,8 +1736,10 @@ namespace cryptonote
} }
else else
{ {
res.status = std::string("Transaction not found in pool: ") + str; if (!res.status.empty()) res.status += ", ";
res.status += std::string("transaction not found in pool: ") + str;
failed = true; failed = true;
continue;
} }
} }