mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1699 from lucas-clemente/fix-short-packet-cutting

Browse source 
fix length check for too short packets
This commit is contained in:
Marten Seemann 2019-01-01 12:08:25 +07:00 • committed by GitHub
commit 8b2eb76b75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packet_handler_map.go
View file

@ -202,7 +202,7 @@ func (h *packetHandlerMap) parsePacket(
var rest []byte
if hdr.IsLongHeader {
if protocol.ByteCount(len(data)) < hdr.Length {
if protocol.ByteCount(len(data)) < hdr.ParsedLen()+hdr.Length {
return packets, fmt.Errorf("packet length (%d bytes) is smaller than the expected length (%d bytes)", len(data)-int(hdr.ParsedLen()), hdr.Length)
}
packetLen := int(hdr.ParsedLen() + hdr.Length)

9
packet_handler_map_test.go
View file

@ -138,7 +138,14 @@ var _ = Describe("Packet Handler Map", func() {
})
Context("coalesced packets", func() {
It("errors on packets that are smaller than the length in the packet header", func() {
It("errors on packets that are smaller than the length in the packet header, for too small packet number", func() {
connID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
data := getPacketWithLength(connID, 3) // gets a packet with a 2 byte packet number
_, err := handler.parsePacket(nil, nil, data)
Expect(err).To(MatchError("packet length (2 bytes) is smaller than the expected length (3 bytes)"))
})
It("errors on packets that are smaller than the length in the packet header, for too small payload", func() {
connID := protocol.ConnectionID{1, 2, 3, 4, 5, 6, 7, 8}
data := append(getPacketWithLength(connID, 1000), make([]byte, 500-2 /* for packet number length */)...)
_, err := handler.parsePacket(nil, nil, data)