Fix possible crash when forks are rejected by checkpoints.

muntorg · Dec 26, 2016 · 4ddc1b1 · 4ddc1b1
1 parent 67463c2
commit 4ddc1b1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -3237,7 +3237,7 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
 
         assert(pindexPrev);
         if (fCheckpointsEnabled && !CheckIndexAgainstCheckpoint(pindexPrev, state, chainparams, hash))
-            return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__, state.GetRejectReason().c_str());
+            return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__, FormatStateMessage(state));
 
         if (!ContextualCheckBlockHeader(block, state, chainparams.GetConsensus(), pindexPrev, GetAdjustedTime()))
             return error("%s: Consensus::ContextualCheckBlockHeader: %s, %s", __func__, hash.ToString(), FormatStateMessage(state));

diff --git a/src/version.h b/src/version.h
@@ -24,7 +24,7 @@ static const int INIT_PROTO_VERSION = 209;
 //! In this version, 'getheaders' was introduced.
 static const int GETHEADERS_VERSION = 31800;
 
-static const int MIN_PEER_PROTO_VERSION = 70002;
+static const int MIN_PEER_PROTO_VERSION = 70014;
 
 static const int CADDR_TIME_VERSION = 31402;