diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-07-06 15:47:57 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2020-07-30 22:51:51 +0000 |
| commit | 0678fc1f975f1bf1bf117bfad258c012d39ef05e (patch) | |
| tree | 3561b638329719b3a4a5fb831233d521b93ee3c4 | |
| parent | Merge pull request #6672 (diff) | |
| download | monero-0678fc1f975f1bf1bf117bfad258c012d39ef05e.tar.xz | |
blockchain: guard against exceptions in add_new_block/children
Reporter requested credit to be given to Decred
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index ef3962afd..f135fb9aa 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -4253,6 +4253,9 @@ bool Blockchain::update_next_cumulative_weight_limit(uint64_t *long_term_effecti //------------------------------------------------------------------ bool Blockchain::add_new_block(const block& bl, block_verification_context& bvc) { + try + { + LOG_PRINT_L3("Blockchain::" << __func__); crypto::hash id = get_block_hash(bl); CRITICAL_REGION_LOCAL(m_tx_pool);//to avoid deadlock lets lock tx_pool for whole add/reorganize process @@ -4280,6 +4283,14 @@ bool Blockchain::add_new_block(const block& bl, block_verification_context& bvc) rtxn_guard.stop(); return handle_block_to_main_chain(bl, id, bvc); + + } + catch (const std::exception &e) + { + LOG_ERROR("Exception at [add_new_block], what=" << e.what()); + bvc.m_verifivation_failed = true; + return false; + } } //------------------------------------------------------------------ //TODO: Refactor, consider returning a failure height and letting |