Merge pull request #5864

bb6acff fix possible block db breakage during re-index (Cory Fields)
TrezarCoin · Mar 11, 2015 · 45b7dc2 · 45b7dc2
2 parents 8cbe1f4 + bb6acff
commit 45b7dc2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main.cpp b/src/main.cpp
@@ -2454,8 +2454,11 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd
     }
 
     nLastBlockFile = nFile;
-    vinfoBlockFile[nFile].nSize += nAddSize;
     vinfoBlockFile[nFile].AddBlock(nHeight, nTime);
+    if (fKnown)
+        vinfoBlockFile[nFile].nSize = std::max(pos.nPos + nAddSize, vinfoBlockFile[nFile].nSize);
+    else
+        vinfoBlockFile[nFile].nSize += nAddSize;
 
     if (!fKnown) {
         unsigned int nOldChunks = (pos.nPos + BLOCKFILE_CHUNK_SIZE - 1) / BLOCKFILE_CHUNK_SIZE;