Skip to content

Commit 6c53a52

Browse files
authored
[r3.4] anacrolix/torrent: Serve peerconn panic fix (#20765)
Cherry-pick of #20748 to release/3.4. Closes erigontech/erigon-qa#403 — a rare path where a bad read while serving a peer request broke an invariant and triggered a logic panic. The fix keeps invariants intact on bad reads. Pulled in via bumps: - `github.com/anacrolix/torrent` to the version containing the fix - transitive `github.com/RoaringBitmap/roaring/v2` to v2.16.0 (required by the new torrent version); drops unused indirect `github.com/RoaringBitmap/roaring` v1 Make sure to trigger the first two workflows per the linked issue to verify.
1 parent af2e28d commit 6c53a52

2 files changed

Lines changed: 6 additions & 10 deletions

File tree

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ require (
1919
github.com/99designs/gqlgen v0.17.89
2020
github.com/FastFilter/xorfilter v0.5.1
2121
github.com/Masterminds/sprig/v3 v3.2.3
22-
github.com/RoaringBitmap/roaring/v2 v2.14.4
22+
github.com/RoaringBitmap/roaring/v2 v2.16.0
2323
github.com/alecthomas/kong v0.8.1
2424
github.com/anacrolix/envpprof v1.5.0
2525
github.com/anacrolix/generics v0.2.0
2626
github.com/anacrolix/go-libutp v1.3.3-0.20251121015447-f294e5ed5b4d
2727
github.com/anacrolix/log v0.17.1-0.20251118025802-918f1157b7bb
2828
github.com/anacrolix/missinggo/v2 v2.10.0
2929
github.com/anacrolix/sync v0.5.5-0.20251119100342-d78dd1f686f1
30-
github.com/anacrolix/torrent v1.61.1-0.20260306043331-7dea980541ac
30+
github.com/anacrolix/torrent v1.61.1-0.20260423052610-0aa61207b935
3131
github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b
3232
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
3333
github.com/cenkalti/backoff/v4 v4.3.0
@@ -153,7 +153,6 @@ require (
153153
github.com/Masterminds/semver/v3 v3.4.0 // indirect
154154
github.com/MirrexOne/unqueryvet v1.5.3 // indirect
155155
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
156-
github.com/RoaringBitmap/roaring v1.9.4 // indirect
157156
github.com/agnivade/levenshtein v1.2.1 // indirect
158157
github.com/alecthomas/atomic v0.1.0-alpha2 // indirect
159158
github.com/alecthomas/chroma/v2 v2.23.1 // indirect

go.sum

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,8 @@ github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHf
6363
github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
6464
github.com/RoaringBitmap/roaring v0.4.17/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI=
6565
github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
66-
github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=
67-
github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
68-
github.com/RoaringBitmap/roaring/v2 v2.14.4 h1:4aKySrrg9G/5oRtJ3TrZLObVqxgQ9f1znCRBwEwjuVw=
69-
github.com/RoaringBitmap/roaring/v2 v2.14.4/go.mod h1:oMvV6omPWr+2ifRdeZvVJyaz+aoEUopyv5iH0u/+wbY=
66+
github.com/RoaringBitmap/roaring/v2 v2.16.0 h1:Kys1UNf49d5W8Tq3bpuAhIr/Z8/yPB+59CO8A6c/BbE=
67+
github.com/RoaringBitmap/roaring/v2 v2.16.0/go.mod h1:eq4wdNXxtJIS/oikeCzdX1rBzek7ANzbth041hrU8Q4=
7068
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
7169
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
7270
github.com/agnivade/levenshtein v1.2.1 h1:EHBY3UOn1gwdy/VbFwgo4cxecRznFk7fKWN1KOX7eoM=
@@ -145,8 +143,8 @@ github.com/anacrolix/sync v0.5.5-0.20251119100342-d78dd1f686f1/go.mod h1:21cUWer
145143
github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
146144
github.com/anacrolix/tagflag v1.0.0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
147145
github.com/anacrolix/tagflag v1.1.0/go.mod h1:Scxs9CV10NQatSmbyjqmqmeQNwGzlNe0CMUMIxqHIG8=
148-
github.com/anacrolix/torrent v1.61.1-0.20260306043331-7dea980541ac h1:gpzbmV0sooJvesid+HTgoG/bR8IS38k6jbD1hyHI04M=
149-
github.com/anacrolix/torrent v1.61.1-0.20260306043331-7dea980541ac/go.mod h1:CJaFHVYZv9k3btNExGGHIXjI6vvGb10QoCRWOKpUd10=
146+
github.com/anacrolix/torrent v1.61.1-0.20260423052610-0aa61207b935 h1:7zYUWXNTCDMQSTO/SIYUOXbn/tEp5D5wWQJycahpst0=
147+
github.com/anacrolix/torrent v1.61.1-0.20260423052610-0aa61207b935/go.mod h1:WOyzkjUtFTK7sZNqgGtoAmWLUsJ0XIwyvw0zLI63h7M=
150148
github.com/anacrolix/upnp v0.1.4 h1:+2t2KA6QOhm/49zeNyeVwDu1ZYS9dB9wfxyVvh/wk7U=
151149
github.com/anacrolix/upnp v0.1.4/go.mod h1:Qyhbqo69gwNWvEk1xNTXsS5j7hMHef9hdr984+9fIic=
152150
github.com/anacrolix/utp v0.1.0 h1:FOpQOmIwYsnENnz7tAGohA+r6iXpRjrq8ssKSre2Cp4=
@@ -184,7 +182,6 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
184182
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
185183
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
186184
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
187-
github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
188185
github.com/bits-and-blooms/bitset v1.24.2 h1:M7/NzVbsytmtfHbumG+K2bremQPMJuqv1JD3vOaFxp0=
189186
github.com/bits-and-blooms/bitset v1.24.2/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
190187
github.com/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5w=

0 commit comments

Comments
 (0)