[wallet] Make sure pindex is non-null before possibly referencing in …

…LogPrintf call. Github-Pull: #10265 Rebased-From: c36ea69
bitcoin · ff13f592c5813b18340a6e9e65abb4e356aac400 · kallewoof committed with luke-jr Apr 23, 2017 · Apr 23, 2017 · ff13f59
1 parent e23cef0
commit ff13f592c5813b18340a6e9e65abb4e356aac400
Unified Split

Showing with 4 additions and 4 deletions.

+4 −4 src/wallet/wallet.cpp
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1572,6 +1572,10 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
+            if (GetTime() >= nNow + 60) {
+                nNow = GetTime();
+                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
+            }
 
             CBlock block;
             if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) {
@@ -1585,10 +1589,6 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f
                 ret = nullptr;
             }
             pindex = chainActive.Next(pindex);
-            if (GetTime() >= nNow + 60) {
-                nNow = GetTime();
-                LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
-            }
         }
         ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI
     }