fix pullsync panic on unprotected read from map (#381)

e3743a4d · acud · GitHub · f1a6def3 · e3743a4d
Commit e3743a4d authored Jun 26, 2020 by acud Committed by GitHub Jun 26, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

pullsync.go pkg/pullsync/pullsync.go +3 -2

No files found.
--- a/pkg/pullsync/pullsync.go
+++ b/pkg/pullsync/pullsync.go
@@ -403,12 +403,13 @@ func (s *Syncer) cancelHandler(ctx context.Context, p p2p.Peer, stream p2p.Strea
 		return fmt.Errorf("read cancel: %w", err)
 	}

+	s.ruidMtx.Lock()
+	defer s.ruidMtx.Unlock()
+
 	if cancel, ok := s.ruidCtx[c.Ruid]; ok {
 		cancel()
 	}
-	s.ruidMtx.Lock()
 	delete(s.ruidCtx, c.Ruid)
-	s.ruidMtx.Unlock()
 	return nil
 }