gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

ackhandler: immediately clear ackedPacket slice after processing ACK (#5313)

Browse Source 
* ackhandler: immediately clear ackedPacket slice after processing ACK

* ackhandler: add defensive check for empty ackedPackets slice
This commit is contained in:
Marten Seemann
2025-08-28 22:12:20 +08:00
committed by GitHub
parent 168889f283
commit c8e7cd66e3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/ackhandler/sent_packet_handler.go
View File

@@ -406,7 +406,9 @@ func (h *sentPacketHandler) ReceivedAck(ack *wire.AckFrame, encLevel protocol.En
} }
// After this point, we must not use ackedPackets any longer! // After this point, we must not use ackedPackets any longer!
// We've already returned the buffers. // We've already returned the buffers.
ackedPackets = nil //nolint:ineffassign // This is just to be on the safe side. ackedPackets = nil //nolint:ineffassign // This is just to be on the safe side.
clear(h.ackedPackets) // make sure the memory is released
h.ackedPackets = h.ackedPackets[:0]
// Reset the pto_count unless the client is unsure if the server has validated the client's address. // Reset the pto_count unless the client is unsure if the server has validated the client's address.
if h.peerCompletedAddressValidation { if h.peerCompletedAddressValidation {
@@ -432,8 +434,10 @@ func (h *sentPacketHandler) GetLowestPacketNotConfirmedAcked() protocol.PacketNu
// Packets are returned in ascending packet number order. // Packets are returned in ascending packet number order.
func (h *sentPacketHandler) detectAndRemoveAckedPackets(ack *wire.AckFrame, encLevel protocol.EncryptionLevel) ([]*packet, error) { func (h *sentPacketHandler) detectAndRemoveAckedPackets(ack *wire.AckFrame, encLevel protocol.EncryptionLevel) ([]*packet, error) {
pnSpace := h.getPacketNumberSpace(encLevel) pnSpace := h.getPacketNumberSpace(encLevel)
h.ackedPackets = h.ackedPackets[:0]
ackRangeIndex := 0 ackRangeIndex := 0
if len(h.ackedPackets) > 0 {
return nil, errors.New("ackhandler BUG: ackedPackets slice not empty")
}
lowestAcked := ack.LowestAcked() lowestAcked := ack.LowestAcked()
largestAcked := ack.LargestAcked() largestAcked := ack.LargestAcked()
for p := range pnSpace.history.Packets() { for p := range pnSpace.history.Packets() {