fix leak in block presence manager

Author: Wondertan

bitswap/client/internal/blockpresencemanager/blockpresencemanager.go

@@ -111,6 +111,10 @@ func (bpm *BlockPresenceManager) allDontHave(peers []peer.ID, c cid.Cid) bool {
 
 // RemoveKeys cleans up the given keys from the block presence map
 func (bpm *BlockPresenceManager) RemoveKeys(ks []cid.Cid) {
+	if len(ks) == 0 {
+		return
+	}
+
 	bpm.Lock()
 	defer bpm.Unlock()
 

bitswap/client/internal/session/session.go

@@ -111,6 +111,7 @@ type Session struct {
 	sprm           SessionPeerManager
 	providerFinder ProviderFinder
 	sim            *bssim.SessionInterestManager
+	bpm            *bsbpm.BlockPresenceManager
 
 	sw  sessionWants
 	sws sessionWantSender
@@ -162,6 +163,7 @@ func New(
 		sprm:                sprm,
 		providerFinder:      providerFinder,
 		sim:                 sim,
+		bpm:                 bpm,
 		incoming:            make(chan op, 128),
 		latencyTrkr:         latencyTracker{},
 		notif:               notif,
@@ -443,7 +445,10 @@ func (s *Session) handleReceive(ks []cid.Cid) {
 
 	// Inform the SessionInterestManager that this session is no longer
 	// expecting to receive the wanted keys
-	s.sim.RemoveSessionInterested(s.id, wanted)
+	deleted := s.sim.RemoveSessionInterested(s.id, wanted)
+	// make sure to clean up the block presence manager
+	// for keys no session is interested in
+	s.bpm.RemoveKeys(deleted)
 
 	s.idleTick.Stop()