other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 20:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add recover() to H2 server's flushWriter.Write() 

Fixes https://github.com/XTLS/Xray-core/issues/1748
This commit is contained in:
RPRX 2023-03-08 14:06:20 +00:00 committed by GitHub
parent 4a0b45d1ff
commit 836e84b851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/internet/http/dialer.go
View File

@ -204,7 +204,7 @@ type WaitReadCloser struct {
func (w *WaitReadCloser) Set(rc io.ReadCloser) { func (w *WaitReadCloser) Set(rc io.ReadCloser) {
w.ReadCloser = rc w.ReadCloser = rc
defer func() { defer func() {
if err := recover(); err != nil { if recover() != nil {
rc.Close() rc.Close()
} }
}() }()
@ -225,11 +225,9 @@ func (w *WaitReadCloser) Close() error {
return w.ReadCloser.Close() return w.ReadCloser.Close()
} }
defer func() { defer func() {
if err := recover(); err != nil { if recover() != nil && w.ReadCloser != nil {
if w.ReadCloser != nil {
w.ReadCloser.Close() w.ReadCloser.Close()
} }
}
}() }()
close(w.Wait) close(w.Wait)
return nil return nil

7
transport/internet/http/hub.go
View File

@ -51,6 +51,13 @@ func (fw flushWriter) Write(p []byte) (n int, err error) {
return 0, io.ErrClosedPipe return 0, io.ErrClosedPipe
} }
defer func() {
if recover() != nil {
fw.d.Close()
err = io.ErrClosedPipe
}
}()
n, err = fw.w.Write(p) n, err = fw.w.Write(p)
if f, ok := fw.w.(http.Flusher); ok && err == nil { if f, ok := fw.w.(http.Flusher); ok && err == nil {
f.Flush() f.Flush()