diff options
| author | tobtoht <tob@featherwallet.org> | 2026-03-28 19:48:54 +0000 |
|---|---|---|
| committer | tobtoht <tob@featherwallet.org> | 2026-03-28 19:48:54 +0000 |
| commit | 9b1239dc56ef2048a6c5123df9d47549f5f2e2cc (patch) | |
| tree | 08e8ae519f3ca12a0f56205ff2976b356794baea | |
| parent | 96d924c0a9741063b3be131a1ca1792112990bf5 (diff) | |
| parent | f9d089a3e45338bfbb5abf88733b15718438a576 (diff) | |
| download | monzero-core-9b1239dc56ef2048a6c5123df9d47549f5f2e2cc.tar.gz monzero-core-9b1239dc56ef2048a6c5123df9d47549f5f2e2cc.tar.xz monzero-core-9b1239dc56ef2048a6c5123df9d47549f5f2e2cc.zip | |
Merge pull request #10373
f9d089a cryptonote_core: try-catch in prepare same as cleanup (j-berman)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index e9932ca39..627f11450 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1349,7 +1349,11 @@ namespace cryptonote bool core::prepare_handle_incoming_blocks(const std::vector<block_complete_entry> &blocks_entry, std::vector<block> &blocks) { m_incoming_tx_lock.lock(); - if (!m_blockchain_storage.prepare_handle_incoming_blocks(blocks_entry, blocks)) + bool success = false; + try { success = m_blockchain_storage.prepare_handle_incoming_blocks(blocks_entry, blocks); } + catch (const std::exception &e) { MERROR("Failed prepare handle incoming blocks: " << e.what()); } + catch (...) { MERROR("Failed prepare handling incoming blocks"); } + if (!success) { cleanup_handle_incoming_blocks(false); return false; |