Add missing cs_main locks when calling blockToJSON/blockheaderToJSON

practicalswift · practicalswift · commit a9b6ba0b7cd2 · 2017-11-07T07:17:47.000+01:00
diff --git a/src/rest.cpp b/src/rest.cpp
@@ -178,8 +178,11 @@ static bool rest_headers(HTTPRequest* req,
     }
     case RF_JSON: {
         UniValue jsonHeaders(UniValue::VARR);
-        for (const CBlockIndex *pindex : headers) {
-            jsonHeaders.push_back(blockheaderToJSON(pindex));
+        {
+            LOCK(cs_main);
+            for (const CBlockIndex *pindex : headers) {
+                jsonHeaders.push_back(blockheaderToJSON(pindex));
+            }
         }
         std::string strJSON = jsonHeaders.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
@@ -239,7 +242,11 @@ static bool rest_block(HTTPRequest* req,
     }
 
     case RF_JSON: {
-        UniValue objBlock = blockToJSON(block, pblockindex, showTxDetails);
+        UniValue objBlock;
+        {
+            LOCK(cs_main);
+            objBlock = blockToJSON(block, pblockindex, showTxDetails);
+        }
         std::string strJSON = objBlock.write() + "\n";
         req->WriteHeader("Content-Type", "application/json");
         req->WriteReply(HTTP_OK, strJSON);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -78,6 +78,7 @@ double GetDifficulty(const CBlockIndex* blockindex)
 
 UniValue blockheaderToJSON(const CBlockIndex* blockindex)
 {
+    AssertLockHeld(cs_main);
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("hash", blockindex->GetBlockHash().GetHex()));
     int confirmations = -1;
@@ -106,6 +107,7 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)
 
 UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails)
 {
+    AssertLockHeld(cs_main);
     UniValue result(UniValue::VOBJ);
     result.push_back(Pair("hash", blockindex->GetBlockHash().GetHex()));
     int confirmations = -1;

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ double GetDifficulty(const CBlockIndex* blockindex)`
`78`	`78`
`79`	`79`	`UniValue blockheaderToJSON(const CBlockIndex* blockindex)`
`80`	`80`	`{`
	`81`	`+ AssertLockHeld(cs_main);`
`81`	`82`	`UniValue result(UniValue::VOBJ);`
`82`	`83`	`result.push_back(Pair("hash", blockindex->GetBlockHash().GetHex()));`
`83`	`84`	`int confirmations = -1;`
`@@ -106,6 +107,7 @@ UniValue blockheaderToJSON(const CBlockIndex* blockindex)`
`106`	`107`
`107`	`108`	`UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails)`
`108`	`109`	`{`
	`110`	`+ AssertLockHeld(cs_main);`
`109`	`111`	`UniValue result(UniValue::VOBJ);`
`110`	`112`	`result.push_back(Pair("hash", blockindex->GetBlockHash().GetHex()));`
`111`	`113`	`int confirmations = -1;`