mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-28 11:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix another potential infinite loop

Browse Source 
if a.nNew == 0 -> pickFromOldBucket=true, but we don't have enough items
  (a.nOld > len(oldBucketToAddrsMap) false)
This commit is contained in:
Anton Kaliaev
2019-01-30 13:45:17 +04:00
parent e42e46dcce
commit 146540c112
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
p2p/pex/addrbook.go
+4 -4
View File
@@ -413,12 +413,12 @@ ADDRS_LOOP:
for selectionIndex < numAddresses {
// determine whether to pick from an old bucket.
// if there's not enough old addresses to pick from, then we cant pick from old bucket.
pickFromOldBucket := int((float64(selectionIndex)/float64(numAddresses))*100) >= biasTowardsNewAddrs
pickFromOldBucket = (pickFromOldBucket && a.nOld > 0 && len(oldBucketToAddrsMap) < a.nOld) || a.nNew == 0
biasedTowardsOldAddrs := int((float64(selectionIndex)/float64(numAddresses))*100) >= biasTowardsNewAddrs
// if there's not enough old addresses to pick from, then we can't pick from old bucket.
pickFromOldBucket := biasedTowardsOldAddrs && a.nOld > len(oldBucketToAddrsMap)
// if there's not enough new addrs to pick from, just return early.
if !pickFromOldBucket && len(newBucketToAddrsMap) >= a.nNew {
if !pickFromOldBucket && a.nNew <= len(newBucketToAddrsMap) {
return selection
}