lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-16 09:26:21 -05:00
Code Issues Releases Wiki Activity

fix again the race condition issue

Browse Source
This commit is contained in:
v2ray 2016-04-19 14:51:52 +02:00
parent 1732d33ba9
commit 8c2b18cac4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
transport/ray/direct.go
View File

@ -57,11 +57,13 @@ func (this *Stream) Read() (*alloc.Buffer, error) {
return nil, io.EOF return nil, io.EOF
} }
this.access.RLock() this.access.RLock()
defer this.access.RUnlock()
if this.buffer == nil { if this.buffer == nil {
this.access.RUnlock()
return nil, io.EOF return nil, io.EOF
} }
result, open := <-this.buffer channel := this.buffer
this.access.RUnlock()
result, open := <-channel
if !open { if !open {
return nil, io.EOF return nil, io.EOF
} }
@ -72,17 +74,11 @@ func (this *Stream) Write(data *alloc.Buffer) error {
if this.closed { if this.closed {
return io.EOF return io.EOF
} }
if this.buffer == nil {
return io.EOF
}
this.access.RLock() this.access.RLock()
defer this.access.RUnlock() defer this.access.RUnlock()
if this.closed { if this.closed {
return io.EOF return io.EOF
} }
if this.buffer == nil {
return io.EOF
}
this.buffer <- data this.buffer <- data
return nil return nil
} }
@ -91,8 +87,8 @@ func (this *Stream) Close() {
if this.closed { if this.closed {
return return
} }
this.access.RLock() this.access.Lock()
defer this.access.RUnlock() defer this.access.Unlock()
if this.closed { if this.closed {
return return
} }