Skip to content

Commit 999b812

Browse files
committed
Fix race in msgReader
1 parent 3a526d8 commit 999b812

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

read.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,8 @@ func (mr *msgReader) Read(p []byte) (n int, err error) {
352352
}
353353
if xerrors.Is(err, io.EOF) {
354354
err = io.EOF
355+
356+
mr.returnFlateReader()
355357
}
356358
}()
357359

@@ -373,11 +375,7 @@ func (mr *msgReader) read(p []byte) (int, error) {
373375
if mr.payloadLength == 0 {
374376
if mr.fin {
375377
if mr.flate {
376-
n, err := mr.flateTail.Read(p)
377-
if xerrors.Is(err, io.EOF) {
378-
mr.returnFlateReader()
379-
}
380-
return n, err
378+
return mr.flateTail.Read(p)
381379
}
382380
return 0, io.EOF
383381
}

0 commit comments

Comments
 (0)