diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-15 18:21:19 +0100 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-15 18:21:19 +0100 |
| commit | 2f8e0af7f9a1bdef41195aa68c1cd995c9c630ed (patch) | |
| tree | 27e5dd43fd73877a14dfa5372e05d060b0ed3ffe | |
| parent | Merge pull request #1861 (diff) | |
| parent | protocol: fix wrong tx being looked up from fluffy block (diff) | |
| download | monero-2f8e0af7f9a1bdef41195aa68c1cd995c9c630ed.tar.xz | |
Merge pull request #1867
b54e19d0 protocol: fix wrong tx being looked up from fluffy block (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_protocol/cryptonote_protocol_handler.inl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl index bb242c5f1..79578a34e 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl +++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl @@ -548,7 +548,16 @@ namespace cryptonote tx_ids.push_back(tx_hash); if (m_core.get_transactions(tx_ids, txes, missing) && missing.empty()) { - have_tx.push_back(tx_to_blob(tx)); + if (txes.size() == 1) + { + have_tx.push_back(tx_to_blob(txes.front())); + } + else + { + MERROR("1 tx requested, none not found, but " << txes.size() << " returned"); + m_core.resume_mine(); + return 1; + } } else { |