validation: Hold cs_main when reading chainActive in RewindBlockIndex

practicalswift · practicalswift · commit 1609809fb2a4 · 2019-05-15T14:58:15.000+02:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4316,6 +4316,7 @@ bool RewindBlockIndex(const CChainParams& params) {
         return false;
     }
 
+    LOCK(cs_main);
     if (::ChainActive().Tip() != nullptr) {
         // FlushStateToDisk can possibly read ::ChainActive(). Be conservative
         // and skip it here, we're about to -reindex-chainstate anyway, so

Original file line number	Diff line number	Diff line change
`@@ -4316,6 +4316,7 @@ bool RewindBlockIndex(const CChainParams& params) {`
`4316`	`4316`	`return false;`
`4317`	`4317`	`}`
`4318`	`4318`
	`4319`	`+ LOCK(cs_main);`
`4319`	`4320`	`if (::ChainActive().Tip() != nullptr) {`
`4320`	`4321`	`// FlushStateToDisk can possibly read ::ChainActive(). Be conservative`
`4321`	`4322`	`// and skip it here, we're about to -reindex-chainstate anyway, so`