mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
fix: double free shouldn't happen now
This commit is contained in:
parent
20e4af5856
commit
08bf63c748
3 changed files with 12 additions and 10 deletions
|
@ -112,7 +112,7 @@ serial_port uart_open(const char* pcPortName)
|
|||
sp->tiNew.c_cc[VTIME] = 0;
|
||||
|
||||
// Try to set the new terminal info struct
|
||||
if(tcsetattr(sp->fd,TCSANOW,&sp->tiNew) == -1) {
|
||||
if(tcsetattr(sp->fd, TCSANOW, &sp->tiNew) == -1) {
|
||||
uart_close(sp);
|
||||
return INVALID_SERIAL_PORT;
|
||||
}
|
||||
|
@ -128,9 +128,13 @@ serial_port uart_open(const char* pcPortName)
|
|||
}
|
||||
|
||||
void uart_close(const serial_port sp) {
|
||||
if (!sp) return;
|
||||
if (sp == INVALID_SERIAL_PORT) return;
|
||||
if (sp == CLAIMED_SERIAL_PORT) return;
|
||||
|
||||
serial_port_unix* spu = (serial_port_unix*)sp;
|
||||
tcflush(spu->fd,TCIOFLUSH);
|
||||
tcsetattr(spu->fd,TCSANOW,&(spu->tiOld));
|
||||
tcflush(spu->fd, TCIOFLUSH);
|
||||
tcsetattr(spu->fd, TCSANOW, &(spu->tiOld));
|
||||
struct flock fl;
|
||||
fl.l_type = F_UNLCK;
|
||||
fl.l_whence = SEEK_SET;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue