forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-05-27 07:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure UART file descriptors are valid before using them in uart_close ().

Browse Source 
The uart_open() function may call uart_close() with a 'serial_port' structure with an invalid member 'fd' if the port was not opened successfully.  The call to uart_close() was kept for consistency with the rest of the function because uart_close() is also in charge of freeing 'serial_port'.
This commit is contained in:
Romain Tartiere
2010-01-15 10:38:50 +00:00
parent 3f8068b760
commit e92de4d49e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/buses/uart.c
View File

@@ -170,8 +170,10 @@ uint32_t uart_get_speed(const serial_port sp)
void uart_close(const serial_port sp) void uart_close(const serial_port sp)
{ {
if (((serial_port_unix*)sp)->fd >= 0) {
tcsetattr(((serial_port_unix*)sp)->fd,TCSANOW,&((serial_port_unix*)sp)->tiOld); tcsetattr(((serial_port_unix*)sp)->fd,TCSANOW,&((serial_port_unix*)sp)->tiOld);
close(((serial_port_unix*)sp)->fd); close(((serial_port_unix*)sp)->fd);
}
free(sp); free(sp);
} }
@@ -333,7 +335,9 @@ serial_port uart_open(const char* pcPortName)
void uart_close(const serial_port sp) void uart_close(const serial_port sp)
{ {
if (((serial_port_windows*)sp)->hPort != INVALID_HANDLE_VALUE) {
CloseHandle(((serial_port_windows*)sp)->hPort); CloseHandle(((serial_port_windows*)sp)->hPort);
}
free(sp); free(sp);
} }