lechu/go-serial
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #173 from jes/master

Browse Source 
unix: nativeOpen: always close the port on errors
This commit is contained in:
Cristian Maglie
2024-02-16 13:51:41 +01:00
committed by GitHub
parent 8a31fcbd9b 0f730e491f
commit 1d3c0099c3
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
serial_unix.go
View File

@@ -249,6 +249,7 @@ func nativeOpen(portName string, mode *Mode) (*unixPort, error) {
if mode.InitialStatusBits != nil { if mode.InitialStatusBits != nil {
status, err := port.getModemBitsStatus() status, err := port.getModemBitsStatus()
if err != nil { if err != nil {
port.Close()
return nil, &PortError{code: InvalidSerialPort, causedBy: err} return nil, &PortError{code: InvalidSerialPort, causedBy: err}
} }
if mode.InitialStatusBits.DTR { if mode.InitialStatusBits.DTR {
@@ -262,6 +263,7 @@ func nativeOpen(portName string, mode *Mode) (*unixPort, error) {
status &^= unix.TIOCM_RTS status &^= unix.TIOCM_RTS
} }
if err := port.setModemBitsStatus(status); err != nil { if err := port.setModemBitsStatus(status); err != nil {
port.Close()
return nil, &PortError{code: InvalidSerialPort, causedBy: err} return nil, &PortError{code: InvalidSerialPort, causedBy: err}
} }
} }