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

Merge pull request #1676 from lucas-clemente/fix-1675

Browse source 
only copy stream data to write when popping a STREAM frame
This commit is contained in:
Marten Seemann 2018-12-18 16:21:06 +06:30 • committed by GitHub
commit dadb6d395c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
send_stream.go
View file

@ -95,8 +95,7 @@ func (s *sendStream) Write(p []byte) (int, error) {
return 0, nil return 0, nil
} }
s.dataForWriting = make([]byte, len(p)) s.dataForWriting = p
copy(s.dataForWriting, p)
s.sender.onHasStreamData(s.streamID) s.sender.onHasStreamData(s.streamID)
var bytesWritten int var bytesWritten int
@ -202,10 +201,12 @@ func (s *sendStream) getDataForWriting(maxBytes protocol.ByteCount) ([]byte, boo
var ret []byte var ret []byte
if protocol.ByteCount(len(s.dataForWriting)) > maxBytes { if protocol.ByteCount(len(s.dataForWriting)) > maxBytes {
ret = s.dataForWriting[:maxBytes] ret = make([]byte, int(maxBytes))
copy(ret, s.dataForWriting[:maxBytes])
s.dataForWriting = s.dataForWriting[maxBytes:] s.dataForWriting = s.dataForWriting[maxBytes:]
} else { } else {
ret = s.dataForWriting ret = make([]byte, len(s.dataForWriting))
copy(ret, s.dataForWriting)
s.dataForWriting = nil s.dataForWriting = nil
s.signalWrite() s.signalWrite()
} }

3
send_stream_test.go
View file

@ -149,10 +149,11 @@ var _ = Describe("Send Stream", func() {
waitForWrite() waitForWrite()
frame, _ := str.popStreamFrame(frameHeaderSize + 1) frame, _ := str.popStreamFrame(frameHeaderSize + 1)
Expect(frame.Data).To(Equal([]byte("f"))) Expect(frame.Data).To(Equal([]byte("f")))
s[1] = 'e'
f, _ := str.popStreamFrame(100) f, _ := str.popStreamFrame(100)
Expect(f).ToNot(BeNil()) Expect(f).ToNot(BeNil())
Expect(f.Data).To(Equal([]byte("oo"))) Expect(f.Data).To(Equal([]byte("oo")))
s[1] = 'e'
Expect(f.Data).To(Equal([]byte("oo")))
Eventually(done).Should(BeClosed()) Eventually(done).Should(BeClosed())
}) })