mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

check for uninitialized fields when closing the Transport (#3908)

Browse source 
* close Transport: check for possibly uninitialized fields

* close Transport: close Conn, as conn might not be initialized

* close Transport: add test case
This commit is contained in:
kelmenhorst 2023-06-21 11:14:57 +02:00 • committed by GitHub
parent 9acce3c6d9
commit 8352e5dc32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
transport.go
View file

@ -244,14 +244,16 @@ func (t *Transport) runSendQueue() {
func (t *Transport) Close() error {
t.close(errors.New("closing"))
if t.createdConn {
if err := t.conn.Close(); err != nil {
if err := t.Conn.Close(); err != nil {
return err
}
} else {
} else if t.conn != nil {
t.conn.SetReadDeadline(time.Now())
defer func() { t.conn.SetReadDeadline(time.Time{}) }()
}
<-t.listening // wait until listening returns
if t.listening != nil {
<-t.listening // wait until listening returns
}
return nil
}
@ -280,7 +282,9 @@ func (t *Transport) close(e error) {
return
}
t.handlerMap.Close(e)
if t.handlerMap != nil {
t.handlerMap.Close(e)
}
if t.server != nil {
t.server.setCloseError(e)
}