github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix a buffer leak in buffered reader

pull/786/head
Darien Raymond 2017-12-16 02:02:48 +01:00
parent c6b07a8fc1
commit 0959755d21
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/buf/writer.go
View File

@ -93,6 +93,9 @@ func (w *BufferedWriter) WriteMultiBuffer(b MultiBuffer) error {
defer b.Release() defer b.Release()
for !b.IsEmpty() { for !b.IsEmpty() {
if w.buffer == nil {
w.buffer = New()
}
if err := w.buffer.AppendSupplier(ReadFrom(&b)); err != nil { if err := w.buffer.AppendSupplier(ReadFrom(&b)); err != nil {
return err return err
} }
@ -113,11 +116,7 @@ func (w *BufferedWriter) Flush() error {
return err return err
} }
if w.buffered { w.buffer = nil
w.buffer = New()
} else {
w.buffer = nil
}
} }
return nil return nil
} }