consensus: don't call GetBlockPos in ReadBlockFromDisk without lock

jonatack · jonatack · commit 350e034e64d1 · 2021-09-05T17:55:06.000+02:00
diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp
@@ -394,18 +394,14 @@ bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, const Consensus::P
 
 bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus::Params& consensusParams)
 {
-    FlatFilePos blockPos;
-    {
-        LOCK(cs_main);
-        blockPos = pindex->GetBlockPos();
-    }
+    const FlatFilePos block_pos{WITH_LOCK(cs_main, return pindex->GetBlockPos())};
 
-    if (!ReadBlockFromDisk(block, blockPos, consensusParams)) {
+    if (!ReadBlockFromDisk(block, block_pos, consensusParams)) {
         return false;
     }
     if (block.GetHash() != pindex->GetBlockHash()) {
         return error("ReadBlockFromDisk(CBlock&, CBlockIndex*): GetHash() doesn't match index for %s at %s",
-                     pindex->ToString(), pindex->GetBlockPos().ToString());
+                     pindex->ToString(), block_pos.ToString());
     }
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -394,18 +394,14 @@ bool ReadBlockFromDisk(CBlock& block, const FlatFilePos& pos, const Consensus::P`
`394`	`394`
`395`	`395`	`bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex, const Consensus::Params& consensusParams)`
`396`	`396`	`{`
`397`		`- FlatFilePos blockPos;`
`398`		`- {`
`399`		`- LOCK(cs_main);`
`400`		`- blockPos = pindex->GetBlockPos();`
`401`		`- }`
	`397`	`+ const FlatFilePos block_pos{WITH_LOCK(cs_main, return pindex->GetBlockPos())};`
`402`	`398`
`403`		`- if (!ReadBlockFromDisk(block, blockPos, consensusParams)) {`
	`399`	`+ if (!ReadBlockFromDisk(block, block_pos, consensusParams)) {`
`404`	`400`	`return false;`
`405`	`401`	`}`
`406`	`402`	`if (block.GetHash() != pindex->GetBlockHash()) {`
`407`	`403`	`return error("ReadBlockFromDisk(CBlock&, CBlockIndex*): GetHash() doesn't match index for %s at %s",`
`408`		`- pindex->ToString(), pindex->GetBlockPos().ToString());`
	`404`	`+ pindex->ToString(), block_pos.ToString());`
`409`	`405`	`}`
`410`	`406`	`return true;`
`411`	`407`	`}`