Merge pull request #492 from zcoinofficial/fix_reading_error

Skipped reading on garbage records
firoorg · Jul 5, 2019 · a33f266 · a33f266
2 parents 27a1eec + d903a30
commit a33f266
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -1414,26 +1414,31 @@ std::vector<std::pair<uint256, MintPoolEntry>> CWalletDB::ListMintPool()
         }
 
         // Unserialize
-        string strType;
-        ssKey >> strType;
-        if (strType != "mintpool")
-            break;
 
-        uint256 hashPubcoin;
-        ssKey >> hashPubcoin;
+        try {
+            string strType;
+            ssKey >> strType;
+            if (strType != "mintpool")
+                break;
 
-        uint160 hashSeedMaster;
-        ssValue >> hashSeedMaster;
+            uint256 hashPubcoin;
+            ssKey >> hashPubcoin;
 
-        CKeyID seedId;
-        ssValue >> seedId;
+            uint160 hashSeedMaster;
+            ssValue >> hashSeedMaster;
 
-        int32_t nCount;
-        ssValue >> nCount;
+            CKeyID seedId;
+            ssValue >> seedId;
 
-        MintPoolEntry mintPoolEntry(hashSeedMaster, seedId, nCount);
+            int32_t nCount;
+            ssValue >> nCount;
 
-        listPool.push_back(make_pair(hashPubcoin, mintPoolEntry));
+            MintPoolEntry mintPoolEntry(hashSeedMaster, seedId, nCount);
+
+            listPool.push_back(make_pair(hashPubcoin, mintPoolEntry));
+        } catch (std::ios_base::failure const &) {
+            // There maybe some old entries that don't conform to the latest version. Just skipping those.
+        }
     }
 
     pcursor->close();