Fix missing cs_main lock for GuessVerificationProgress()

jonasschnelli · jonasschnelli · commit 90ba2df11b5b · 2018-01-30T17:49:22.000-10:00
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -138,9 +138,9 @@ size_t ClientModel::getMempoolDynamicUsage() const
 double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const
 {
     CBlockIndex *tip = const_cast<CBlockIndex *>(tipIn);
+    LOCK(cs_main);
     if (!tip)
     {
-        LOCK(cs_main);
         tip = chainActive.Tip();
     }
     return GuessVerificationProgress(Params().TxData(), tip);
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -4659,6 +4659,7 @@ bool DumpMempool(void)
 }
 
 //! Guess how far we are in the verification process at the given block index
+//! require cs_main if pindex has not been validated yet (because nChainTx might be unset)
 double GuessVerificationProgress(const ChainTxData& data, const CBlockIndex *pindex) {
     if (pindex == nullptr)
         return 0.0;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1673,20 +1673,15 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
             dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex);
             dProgressTip = GuessVerificationProgress(chainParams.TxData(), tip);
         }
+        double gvp = dProgressStart;
         while (pindex && !fAbortRescan)
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) {
-                double gvp = 0;
-                {
-                    LOCK(cs_main);
-                    gvp = GuessVerificationProgress(chainParams.TxData(), pindex);
-                }
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((gvp - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
             }
             if (GetTime() >= nNow + 60) {
                 nNow = GetTime();
-                LOCK(cs_main);
-                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
+                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, gvp);
             }
 
             CBlock block;
@@ -1710,6 +1705,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
             {
                 LOCK(cs_main);
                 pindex = chainActive.Next(pindex);
+                gvp = GuessVerificationProgress(chainParams.TxData(), pindex);
                 if (tip != chainActive.Tip()) {
                     tip = chainActive.Tip();
                     // in case the tip has changed, update progress max
@@ -1718,7 +1714,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
             }
         }
         if (pindex && fAbortRescan) {
-            LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
+            LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, gvp);
         }
         ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI
     }

Original file line number	Diff line number	Diff line change
`@@ -138,9 +138,9 @@ size_t ClientModel::getMempoolDynamicUsage() const`
`138`	`138`	`double ClientModel::getVerificationProgress(const CBlockIndex *tipIn) const`
`139`	`139`	`{`
`140`	`140`	`CBlockIndex tip = const_cast<CBlockIndex >(tipIn);`
	`141`	`+ LOCK(cs_main);`
`141`	`142`	`if (!tip)`
`142`	`143`	`{`
`143`		`- LOCK(cs_main);`
`144`	`144`	`tip = chainActive.Tip();`
`145`	`145`	`}`
`146`	`146`	`return GuessVerificationProgress(Params().TxData(), tip);`
Original file line number	Diff line number	Diff line change
`@@ -4659,6 +4659,7 @@ bool DumpMempool(void)`
`4659`	`4659`	`}`
`4660`	`4660`
`4661`	`4661`	`//! Guess how far we are in the verification process at the given block index`
	`4662`	`+//! require cs_main if pindex has not been validated yet (because nChainTx might be unset)`
`4662`	`4663`	`double GuessVerificationProgress(const ChainTxData& data, const CBlockIndex *pindex) {`
`4663`	`4664`	`if (pindex == nullptr)`
`4664`	`4665`	`return 0.0;`
Original file line number	Diff line number	Diff line change
`@@ -1673,20 +1673,15 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1673`	`1673`	`dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex);`
`1674`	`1674`	`dProgressTip = GuessVerificationProgress(chainParams.TxData(), tip);`
`1675`	`1675`	`}`
	`1676`	`+ double gvp = dProgressStart;`
`1676`	`1677`	`while (pindex && !fAbortRescan)`
`1677`	`1678`	`{`
`1678`	`1679`	`if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) {`
`1679`		`- double gvp = 0;`
`1680`		`- {`
`1681`		`- LOCK(cs_main);`
`1682`		`- gvp = GuessVerificationProgress(chainParams.TxData(), pindex);`
`1683`		`- }`
`1684`	`1680`	`ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((gvp - dProgressStart) / (dProgressTip - dProgressStart) * 100))));`
`1685`	`1681`	`}`
`1686`	`1682`	`if (GetTime() >= nNow + 60) {`
`1687`	`1683`	`nNow = GetTime();`
`1688`		`- LOCK(cs_main);`
`1689`		`- LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));`
	`1684`	`+ LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, gvp);`
`1690`	`1685`	`}`
`1691`	`1686`
`1692`	`1687`	`CBlock block;`
`@@ -1710,6 +1705,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1710`	`1705`	`{`
`1711`	`1706`	`LOCK(cs_main);`
`1712`	`1707`	`pindex = chainActive.Next(pindex);`
	`1708`	`+ gvp = GuessVerificationProgress(chainParams.TxData(), pindex);`
`1713`	`1709`	`if (tip != chainActive.Tip()) {`
`1714`	`1710`	`tip = chainActive.Tip();`
`1715`	`1711`	`// in case the tip has changed, update progress max`
`@@ -1718,7 +1714,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1718`	`1714`	`}`
`1719`	`1715`	`}`
`1720`	`1716`	`if (pindex && fAbortRescan) {`
`1721`		`- LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));`
	`1717`	`+ LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, gvp);`
`1722`	`1718`	`}`
`1723`	`1719`	`ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI`
`1724`	`1720`	`}`