aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/cryptonote_core.cpp
diff options
context:
space:
mode:
authorThomas Winget <tewinget@gmail.com>2014-09-27 17:46:12 -0400
committerThomas Winget <tewinget@gmail.com>2014-09-30 16:21:37 -0400
commit7568f89c5559a667c53dfaa6d1bef27fe3b4ae86 (patch)
tree4046f5242a9d587f96710fc1819b3ab9ea988275 /src/cryptonote_core/cryptonote_core.cpp
parentb261d9207ba5cdc0334fab403204971f79b6ca03 (diff)
downloadmonzero-core-7568f89c5559a667c53dfaa6d1bef27fe3b4ae86.tar.gz
monzero-core-7568f89c5559a667c53dfaa6d1bef27fe3b4ae86.tar.xz
monzero-core-7568f89c5559a667c53dfaa6d1bef27fe3b4ae86.zip
Fixed segfault with checkpoints loading
Bounds checking on blockchain_storage' m_blocks.size() when validating against checkpoints. Also moved initial json & DNS checkpoints load to after blockchain init.
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.cpp')
-rw-r--r--src/cryptonote_core/cryptonote_core.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index 1dbc7bf52..d14be252b 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -150,6 +150,10 @@ namespace cryptonote
r = m_blockchain_storage.init(m_config_folder, testnet);
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize blockchain storage");
+ // load json & DNS checkpoints, and verify them
+ // with respect to what blocks we already have
+ update_checkpoints();
+
r = m_miner.init(vm, testnet);
CHECK_AND_ASSERT_MES(r, false, "Failed to initialize blockchain storage");