Merge #11252: [P2P] When clearing addrman clear mapInfo and mapAddr.

sipa · sipa · commit b9bceaf1c081 · 2017-09-11T15:33:20.000-07:00
b86a420 when clearing addrman clear mapInfo and mapAddr (Gregory Sanders) Pull request description: Power failure on my machine resulted in a corrupted addrman that would hit bad assertions when trying to serialize the "cleared" addrman to disk: https://github.com/bitcoin/bitcoin/blob/6866b4912b8013ed748d12250209f7079a3c92e6/src/addrman.h#L320 Tree-SHA512: 07ca8b6cbd88407e5f3f0dccb346ae31bd1392f4210b2d5c5647c853986bfec95cf70240b92bafdc61b90e452a5d8315962738d10c10c2b53fdabff10503d05a
diff --git a/src/addrman.h b/src/addrman.h
@@ -472,6 +472,8 @@ class CAddrMan
         nTried = 0;
         nNew = 0;
         nLastGood = 1; //Initially at 1 so that "never" is strictly worse.
+        mapInfo.clear();
+        mapAddr.clear();
     }
 
     CAddrMan()

Original file line number	Diff line number	Diff line change
`@@ -472,6 +472,8 @@ class CAddrMan`
`472`	`472`	`nTried = 0;`
`473`	`473`	`nNew = 0;`
`474`	`474`	`nLastGood = 1; //Initially at 1 so that "never" is strictly worse.`
	`475`	`+ mapInfo.clear();`
	`476`	`+ mapAddr.clear();`
`475`	`477`	`}`
`476`	`478`
`477`	`479`	`CAddrMan()`