cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-22 21:10:29 +00:00
Code Releases Activity

fix a panic from a doubly closed channel in the simlink

Browse Source
This commit is contained in:
Arceliar 2020-05-02 10:51:26 -05:00
parent 12d448f6d5
commit 15162ee952
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/yggdrasil/simlink.go
View File

@ -14,12 +14,11 @@ type Simlink struct {
} }
func (s *Simlink) readMsg() ([]byte, error) { func (s *Simlink) readMsg() ([]byte, error) {
bs := <-s.rch bs, ok := <-s.rch
if bs != nil { if !ok {
return bs, nil
} else {
return nil, errors.New("read from closed Simlink") return nil, errors.New("read from closed Simlink")
} }
return bs, nil
} }
func (s *Simlink) _recvMetaBytes() ([]byte, error) { func (s *Simlink) _recvMetaBytes() ([]byte, error) {
@ -32,6 +31,7 @@ func (s *Simlink) _sendMetaBytes(bs []byte) error {
} }
func (s *Simlink) close() error { func (s *Simlink) close() error {
defer func() { recover() }()
close(s.rch) close(s.rch)
return nil return nil
} }