Merge pull request #109 from memoos/master

estutzenberger · web-flow · commit 8c5522f54333 · 2024-01-22T10:01:41.000-08:00
Do not leave socket open in case no device can be found
diff --git a/linux/hci/socket/socket.go b/linux/hci/socket/socket.go
@@ -74,6 +74,7 @@ func NewSocket(id int) (*Socket, error) {
 
 	req := devListRequest{devNum: hciMaxDevices}
 	if err = ioctl(uintptr(fd), hciGetDeviceList, uintptr(unsafe.Pointer(&req))); err != nil {
+		unix.Close(fd)
 		return nil, errors.Wrap(err, "can't get device list")
 	}
 	var msg string
@@ -84,6 +85,7 @@ func NewSocket(id int) (*Socket, error) {
 		}
 		msg = msg + fmt.Sprintf("(hci%d: %s)", id, err)
 	}
+	unix.Close(fd)
 	return nil, errors.Errorf("no devices available: %s", msg)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ func NewSocket(id int) (*Socket, error) {`
`74`	`74`
`75`	`75`	`req := devListRequest{devNum: hciMaxDevices}`
`76`	`76`	`if err = ioctl(uintptr(fd), hciGetDeviceList, uintptr(unsafe.Pointer(&req))); err != nil {`
	`77`	`+ unix.Close(fd)`
`77`	`78`	`return nil, errors.Wrap(err, "can't get device list")`
`78`	`79`	`}`
`79`	`80`	`var msg string`
`@@ -84,6 +85,7 @@ func NewSocket(id int) (*Socket, error) {`
`84`	`85`	`}`
`85`	`86`	`msg = msg + fmt.Sprintf("(hci%d: %s)", id, err)`
`86`	`87`	`}`
	`88`	`+ unix.Close(fd)`
`87`	`89`	`return nil, errors.Errorf("no devices available: %s", msg)`
`88`	`90`	`}`
`89`	`91`