From 860aebd30d11ba1d86e9affdb09fd1ed5c7c285a Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Tue, 29 Jul 2025 14:03:48 +1000 Subject: [PATCH] Fix panicif.Nil not working correctly --- go.mod | 2 +- go.sum | 4 ++-- torrent.go | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 63395488..ecf80158 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/anacrolix/gostdapp v0.1.0 github.com/anacrolix/log v0.16.1-0.20250526073428-5cb74e15092b github.com/anacrolix/missinggo v1.3.0 - github.com/anacrolix/missinggo/v2 v2.8.1-0.20250626123431-aa4691b19d56 + github.com/anacrolix/missinggo/v2 v2.9.0 github.com/anacrolix/multiless v0.4.0 github.com/anacrolix/possum/go v0.3.2 github.com/anacrolix/squirrel v0.6.4 diff --git a/go.sum b/go.sum index d2b2d57f..b6a39bdc 100644 --- a/go.sum +++ b/go.sum @@ -105,8 +105,8 @@ github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= github.com/anacrolix/missinggo/v2 v2.2.0/go.mod h1:o0jgJoYOyaoYQ4E2ZMISVa9c88BbUBVQQW4QeRkNCGY= github.com/anacrolix/missinggo/v2 v2.5.1/go.mod h1:WEjqh2rmKECd0t1VhQkLGTdIWXO6f6NLjp5GlMZ+6FA= -github.com/anacrolix/missinggo/v2 v2.8.1-0.20250626123431-aa4691b19d56 h1:+VSnod9Zipey/E5mDTrhooV9y8A8ZaUHSzG/TnrIHug= -github.com/anacrolix/missinggo/v2 v2.8.1-0.20250626123431-aa4691b19d56/go.mod h1:vVO5FEziQm+NFmJesc7StpkquZk+WJFCaL0Wp//2sa0= +github.com/anacrolix/missinggo/v2 v2.9.0 h1:Z1CTa28fjOWPLlOKFlc+GbtsV9Q/0eCs4pOIdd/pnAU= +github.com/anacrolix/missinggo/v2 v2.9.0/go.mod h1:vVO5FEziQm+NFmJesc7StpkquZk+WJFCaL0Wp//2sa0= github.com/anacrolix/mmsg v1.0.1 h1:TxfpV7kX70m3f/O7ielL/2I3OFkMPjrRCPo7+4X5AWw= github.com/anacrolix/mmsg v1.0.1/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc= github.com/anacrolix/multiless v0.4.0 h1:lqSszHkliMsZd2hsyrDvHOw4AbYWa+ijQ66LzbjqWjM= diff --git a/torrent.go b/torrent.go index e1d7b9a0..773d25f1 100644 --- a/torrent.go +++ b/torrent.go @@ -3172,7 +3172,11 @@ func (t *Torrent) cancelRequest(r RequestIndex) *PeerConn { } func (t *Torrent) requestingPeer(r RequestIndex) (ret *PeerConn) { - ret = t.requestState[r].peer.Value() + state, ok := t.requestState[r] + if !ok { + return nil + } + ret = state.peer.Value() panicif.Nil(ret) return } -- 2.51.0