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

throw a MissingPayload error when unpacking packets with no frames

Browse Source 
fixes #175
This commit is contained in:
Marten Seemann
2016-06-10 10:31:18 +07:00
parent 0d46cc1dd4
commit 581dc8a079
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packet_unpacker.go
View File

@@ -37,6 +37,10 @@ func (u *packetUnpacker) Unpack(publicHeaderBinary []byte, hdr *publicHeader, r
}
entropyBit := privateFlag&0x01 > 0
if r.Len() == 0 {
return nil, qerr.MissingPayload
}
fs := make([]frames.Frame, 0, 1)
// Read all frames in the packet

16
packet_unpacker_test.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/lucas-clemente/quic-go/crypto"
"github.com/lucas-clemente/quic-go/frames"
"github.com/lucas-clemente/quic-go/protocol"
"github.com/lucas-clemente/quic-go/qerr"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@@ -37,12 +38,17 @@ var _ = Describe("Packet unpacker", func() {
r = bytes.NewReader(aead.Seal(0, hdrBin, append([]byte{0x01}, data...)))
}
It("unpacks empty packets", func() {
It("returns an error for empty packets that don't have a private flag", func() {
// don't use setReader here, since it adds a private flag
r = bytes.NewReader(aead.Seal(0, hdrBin, []byte{}))
_, err := unpacker.Unpack(hdrBin, hdr, r)
Expect(err).To(MatchError(qerr.MissingPayload))
})
It("returns an error for empty packets that have a private flag", func() {
setReader(nil)
packet, err := unpacker.Unpack(hdrBin, hdr, r)
Expect(err).ToNot(HaveOccurred())
Expect(packet.entropyBit).To(BeTrue())
Expect(packet.frames).To(BeEmpty())
_, err := unpacker.Unpack(hdrBin, hdr, r)
Expect(err).To(MatchError(qerr.MissingPayload))
})
It("unpacks stream frames", func() {