reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2025-02-20 19:40:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vm: fix potential deadlock in OutputMerger

Browse Source
This commit is contained in:
Dmitry Vyukov 2016-08-28 21:00:18 +02:00
parent e9d2eec662
commit 26a5cf9efa
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vm/merger.go
View File

@ -41,9 +41,12 @@ func (merger *OutputMerger) Add(r io.ReadCloser) {
if merger.tee != nil { if merger.tee != nil {
merger.tee.Write(out) merger.tee.Write(out)
} }
merger.Output <- append([]byte{}, out...) select {
r := copy(pending[:], pending[pos+1:]) case merger.Output <- append([]byte{}, out...):
pending = pending[:r] r := copy(pending[:], pending[pos+1:])
pending = pending[:r]
default:
}
} }
} }
if err != nil { if err != nil {
@ -52,7 +55,10 @@ func (merger *OutputMerger) Add(r io.ReadCloser) {
if merger.tee != nil { if merger.tee != nil {
merger.tee.Write(pending) merger.tee.Write(pending)
} }
merger.Output <- pending select {
case merger.Output <- pending:
default:
}
} }
r.Close() r.Close()
merger.wg.Done() merger.wg.Done()