mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #920 from dlesaffre/master

Browse Source 
serial port comm: prevent read in freed memory
This commit is contained in:
Marc-André Moreau 2013-01-23 07:12:19 -08:00
commit 23b7c3b157
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
channels/serial/client/serial_main.c
View File

@ -570,6 +570,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial)
IRP* prev;
SERIAL_TTY* tty;
UINT32 result = 0;
BOOL irp_completed = FALSE;
memset(&serial->tv, 0, sizeof(struct timeval));
tty = serial->tty;
@ -588,6 +589,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial)
{
irp->IoStatus = STATUS_SUCCESS;
serial_process_irp_read(serial, irp);
irp_completed = TRUE;
}
break;
@ -596,6 +598,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial)
{
irp->IoStatus = STATUS_SUCCESS;
serial_process_irp_write(serial, irp);
irp_completed = TRUE;
}
break;
@ -607,6 +610,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial)
irp->IoStatus = STATUS_SUCCESS;
stream_write_UINT32(irp->output, result);
irp->Complete(irp);
irp_completed = TRUE;
}
break;
@ -618,7 +622,7 @@ static void __serial_check_fds(SERIAL_DEVICE* serial)
prev = irp;
irp = (IRP*) list_next(serial->pending_irps, irp);
if (prev->IoStatus == STATUS_SUCCESS)
if (irp_completed || prev->IoStatus == STATUS_SUCCESS)
{
list_remove(serial->pending_irps, prev);
SetEvent(serial->in_event);