lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-09 09:20:45 +00:00
Code Issues Releases Wiki Activity

fix a deadlock in cacheReader. fix #1471

Browse Source
This commit is contained in:
Darien Raymond 2018-12-11 09:17:10 +01:00
parent 372da062d4
commit 0ca762e0e2
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/dispatcher/default.go
View File

@ -46,13 +46,22 @@ func (r *cachedReader) Cache(b *buf.Buffer) {
r.Unlock()
}
func (r *cachedReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
func (r *cachedReader) readInternal() buf.MultiBuffer {
r.Lock()
defer r.Unlock()
if r.cache != nil && !r.cache.IsEmpty() {
mb := r.cache
r.cache = nil
return mb
}
return nil
}
func (r *cachedReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
mb := r.readInternal()
if mb != nil {
return mb, nil
}
@ -60,12 +69,8 @@ func (r *cachedReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
}
func (r *cachedReader) ReadMultiBufferTimeout(timeout time.Duration) (buf.MultiBuffer, error) {
r.Lock()
defer r.Unlock()
if r.cache != nil && !r.cache.IsEmpty() {
mb := r.cache
r.cache = nil
mb := r.readInternal()
if mb != nil {
return mb, nil
}