Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2064 

6fc2dc39 cryptonote_protocol_handler: fix crash in debug log (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-06-18 16:40:52 +02:00
parent 421a6d0340 6fc2dc3927
commit a0174ad534
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -647,9 +647,6 @@ namespace cryptonote
return 1; return 1;
} }
for (auto txidx: arg.missing_tx_indices)
MDEBUG(" tx " << b.tx_hashes[txidx]);
std::vector<crypto::hash> txids; std::vector<crypto::hash> txids;
NOTIFY_NEW_FLUFFY_BLOCK::request fluffy_response; NOTIFY_NEW_FLUFFY_BLOCK::request fluffy_response;
fluffy_response.b.block = t_serializable_object_to_blob(b); fluffy_response.b.block = t_serializable_object_to_blob(b);
@ -659,6 +656,7 @@ namespace cryptonote
{ {
if(tx_idx < b.tx_hashes.size()) if(tx_idx < b.tx_hashes.size())
{ {
MDEBUG(" tx " << b.tx_hashes[tx_idx]);
txids.push_back(b.tx_hashes[tx_idx]); txids.push_back(b.tx_hashes[tx_idx]);
} }
else else