diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-03-13 19:16:25 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-03-13 19:16:25 +0000 |
| commit | b54e19d00e7aa9b8815684d821f6d5ecc17096e1 (patch) | |
| tree | 9f069a1f650e500c693560ff236e6f4d0406b9f7 /src/cryptonote_protocol | |
| parent | Merge pull request #1864 (diff) | |
| download | monero-b54e19d00e7aa9b8815684d821f6d5ecc17096e1.tar.xz | |
protocol: fix wrong tx being looked up from fluffy block
Found by smooth
Diffstat (limited to 'src/cryptonote_protocol')
| -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 { |