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

fix a panic in stream with large window updates

Browse Source 
fixes #143
This commit is contained in:
Lucas Clemente
2016-05-25 13:12:06 +02:00
parent 9e0d211f5e
commit 17865dbba7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stream.go
View File

@@ -200,7 +200,7 @@ func (s *stream) Write(p []byte) (int, error) {
return 0, s.err return 0, s.err
} }
dataLen := utils.Min(len(p), int(remainingBytesInWindow)) dataLen := utils.MinByteCount(protocol.ByteCount(len(p)), remainingBytesInWindow)
data := make([]byte, dataLen) data := make([]byte, dataLen)
copy(data, p) copy(data, p)
err := s.session.queueStreamFrame(&frames.StreamFrame{ err := s.session.queueStreamFrame(&frames.StreamFrame{
@@ -213,7 +213,7 @@ func (s *stream) Write(p []byte) (int, error) {
return 0, err return 0, err
} }
dataWritten += dataLen dataWritten += int(dataLen) // We cannot have written more than the int range
s.flowController.AddBytesSent(protocol.ByteCount(dataLen)) s.flowController.AddBytesSent(protocol.ByteCount(dataLen))
if s.contributesToConnectionFlowControl { if s.contributesToConnectionFlowControl {
s.connectionFlowController.AddBytesSent(protocol.ByteCount(dataLen)) s.connectionFlowController.AddBytesSent(protocol.ByteCount(dataLen))

10
stream_test.go
View File

@@ -464,6 +464,16 @@ var _ = Describe("Stream", func() {
Expect(b).To(BeTrue()) Expect(b).To(BeTrue())
Expect(err).To(MatchError(testErr)) Expect(err).To(MatchError(testErr))
}) })
It("works with large flow control windows", func() {
// This paniced before due to a wrong cast,
// see https://github.com/lucas-clemente/quic-go/issues/143
str.contributesToConnectionFlowControl = false
updated := str.UpdateSendFlowControlWindow(protocol.ByteCount(1) << 63)
Expect(updated).To(BeTrue())
_, err := str.Write([]byte("foobar"))
Expect(err).NotTo(HaveOccurred())
})
}) })
}) })