Merge #7932: CAddrMan::Deserialize handle corrupt serializations better.

fb26bf0 CAddrMan::Deserialize handle corrupt serializations better. (Patrick Strateman)
sickpig · May 2, 2017 · 6239eb6 · 6239eb6
1 parent 16969f5
commit 6239eb6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/addrman.h b/src/addrman.h
@@ -356,6 +356,14 @@ class CAddrMan
             nUBuckets ^= (1 << 30);
         }
 
+        if (nNew > ADDRMAN_NEW_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE) {
+            throw std::ios_base::failure("Corrupt CAddrMan serialization, nNew exceeds limit.");
+        }
+
+        if (nTried > ADDRMAN_TRIED_BUCKET_COUNT * ADDRMAN_BUCKET_SIZE) {
+            throw std::ios_base::failure("Corrupt CAddrMan serialization, nTried exceeds limit.");
+        }
+
         // Deserialize entries from the new table.
         for (int n = 0; n < nNew; n++) {
             CAddrInfo &info = mapInfo[n];