Skip to content

Commit 5a82f80

Browse files
authored
Merge pull request #739 from henry118/panic
do not assign return value to reader/writer variables if there is an …
2 parents c1869a1 + 178bb8c commit 5a82f80

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

internal/vm/ioproxy.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,14 @@ func (connectorPair *IOConnectorPair) proxy(
105105
select {
106106
case readerResult := <-readerResultCh:
107107
readerResultCh = nil
108-
reader, err = readerResult.ReadWriteCloser, readerResult.Err
108+
if err = readerResult.Err; err == nil {
109+
reader = readerResult.ReadWriteCloser
110+
}
109111
case writerResult := <-writerResultCh:
110112
writerResultCh = nil
111-
writer, err = writerResult.ReadWriteCloser, writerResult.Err
113+
if err = writerResult.Err; err == nil {
114+
writer = writerResult.ReadWriteCloser
115+
}
112116
}
113117

114118
if err != nil {

0 commit comments

Comments
 (0)