From 99b1e50722af932fb0d53b2b3c2242c6169c0e1e Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 29 Dec 2018 19:41:07 +0700 Subject: [PATCH] fix length check for too short packets --- packet_handler_map.go | 2 +- packet_handler_map_test.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packet_handler_map.go b/packet_handler_map.go index ba810b44..ce4c5515 100644 --- a/packet_handler_map.go +++ b/packet_handler_map.go @@ -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) diff --git a/packet_handler_map_test.go b/packet_handler_map_test.go index 6a4e9ece..41bd842d 100644 --- a/packet_handler_map_test.go +++ b/packet_handler_map_test.go @@ -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)