Don't leak epoll/kqueue fd on error (#10)

muesli · Jun 22, 2022 · 9e10037 · 9e10037
1 parent d8fcbea
commit 9e10037
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/cancelreader_bsd.go b/cancelreader_bsd.go
@@ -42,6 +42,7 @@ func NewReader(reader io.Reader) (CancelReader, error) {
 
 	r.cancelSignalReader, r.cancelSignalWriter, err = os.Pipe()
 	if err != nil {
+		_ = unix.Close(kQueue)
 		return nil, err
 	}
 

diff --git a/cancelreader_linux.go b/cancelreader_linux.go
@@ -37,6 +37,7 @@ func NewReader(reader io.Reader) (CancelReader, error) {
 
 	r.cancelSignalReader, r.cancelSignalWriter, err = os.Pipe()
 	if err != nil {
+		_ = unix.Close(epoll)
 		return nil, err
 	}
 
@@ -45,6 +46,7 @@ func NewReader(reader io.Reader) (CancelReader, error) {
 		Fd:     int32(file.Fd()),
 	})
 	if err != nil {
+		_ = unix.Close(epoll)
 		return nil, fmt.Errorf("add reader to epoll interrest list")
 	}
 
@@ -53,6 +55,7 @@ func NewReader(reader io.Reader) (CancelReader, error) {
 		Fd:     int32(r.cancelSignalReader.Fd()),
 	})
 	if err != nil {
+		_ = unix.Close(epoll)
 		return nil, fmt.Errorf("add reader to epoll interrest list")
 	}