RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-10-11 Mike Siers <mikes@poliac.com>

Browse Source 
* libc/termios.c: Fixed a memory leak in the termios
	software.  Basically the tty open function was allocating an input
	raw buffer, an output raw buffer, and a cooked buffer that were
	not getting released.  I have attached a patch for the latest
	snapshot.  The patch also has a fix to ensure the tty link list
	is updated correctly when a tty is closed.
This commit is contained in:
Joel Sherrill
2001-10-11 21:21:43 +00:00
parent c682b89389
commit 38db58f82b
4 changed files with 75 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
c/src/exec/libcsupport/src/termios.c
View File

@@ -198,15 +198,18 @@ rtems_termios_open (
tty->tty_rcv.sw_pfn = NULL;
tty->tty_rcv.sw_arg = NULL;
tty->tty_rcvwakeup = 0;
/*
* link tty
*/
if (rtems_termios_ttyHead)
rtems_termios_ttyHead->back = tty;
tty->forw = rtems_termios_ttyHead;
tty->back = NULL;
if (rtems_termios_ttyHead != NULL)
rtems_termios_ttyHead->back = tty;
rtems_termios_ttyHead = tty;
if (rtems_termios_ttyTail == NULL)
rtems_termios_ttyTail = tty;
tty->minor = minor;
tty->major = major;
@@ -411,20 +414,33 @@ rtems_termios_close (void *arg)
}
if (tty->device.lastClose)
(*tty->device.lastClose)(tty->major, tty->minor, arg);
if (tty->forw == NULL)
if (tty->forw == NULL) {
rtems_termios_ttyTail = tty->back;
else
if ( rtems_termios_ttyTail != NULL ) {
rtems_termios_ttyTail->forw = NULL;
}
}
else {
tty->forw->back = tty->back;
if (tty->back == NULL)
}
if (tty->back == NULL) {
rtems_termios_ttyHead = tty->forw;
else
if ( rtems_termios_ttyHead != NULL ) {
rtems_termios_ttyHead->back = NULL;
}
}
else {
tty->back->forw = tty->forw;
}
rtems_semaphore_delete (tty->isem);
rtems_semaphore_delete (tty->osem);
rtems_semaphore_delete (tty->rawOutBuf.Semaphore);
if ((tty->device.pollRead == NULL) ||
(tty->device.outputUsesInterrupts == TERMIOS_TASK_DRIVEN))
rtems_semaphore_delete (tty->rawInBuf.Semaphore);
free (tty->rawInBuf.theBuf);
free (tty->rawOutBuf.theBuf);
free (tty->cbuf);
free (tty);
}
rtems_semaphore_release (rtems_termios_ttyMutex);

9
c/src/lib/ChangeLog
View File

@@ -1,3 +1,12 @@
2001-10-11 Mike Siers <mikes@poliac.com>
* libc/termios.c: Fixed a memory leak in the termios
software. Basically the tty open function was allocating an input
raw buffer, an output raw buffer, and a cooked buffer that were
not getting released. I have attached a patch for the latest
snapshot. The patch also has a fix to ensure the tty link list
is updated correctly when a tty is closed.
2001-10-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Add autom4te.cache for autoconf > 2.52.

28
c/src/lib/libc/termios.c
View File

@@ -198,15 +198,18 @@ rtems_termios_open (
tty->tty_rcv.sw_pfn = NULL;
tty->tty_rcv.sw_arg = NULL;
tty->tty_rcvwakeup = 0;
/*
* link tty
*/
if (rtems_termios_ttyHead)
rtems_termios_ttyHead->back = tty;
tty->forw = rtems_termios_ttyHead;
tty->back = NULL;
if (rtems_termios_ttyHead != NULL)
rtems_termios_ttyHead->back = tty;
rtems_termios_ttyHead = tty;
if (rtems_termios_ttyTail == NULL)
rtems_termios_ttyTail = tty;
tty->minor = minor;
tty->major = major;
@@ -411,20 +414,33 @@ rtems_termios_close (void *arg)
}
if (tty->device.lastClose)
(*tty->device.lastClose)(tty->major, tty->minor, arg);
if (tty->forw == NULL)
if (tty->forw == NULL) {
rtems_termios_ttyTail = tty->back;
else
if ( rtems_termios_ttyTail != NULL ) {
rtems_termios_ttyTail->forw = NULL;
}
}
else {
tty->forw->back = tty->back;
if (tty->back == NULL)
}
if (tty->back == NULL) {
rtems_termios_ttyHead = tty->forw;
else
if ( rtems_termios_ttyHead != NULL ) {
rtems_termios_ttyHead->back = NULL;
}
}
else {
tty->back->forw = tty->forw;
}
rtems_semaphore_delete (tty->isem);
rtems_semaphore_delete (tty->osem);
rtems_semaphore_delete (tty->rawOutBuf.Semaphore);
if ((tty->device.pollRead == NULL) ||
(tty->device.outputUsesInterrupts == TERMIOS_TASK_DRIVEN))
rtems_semaphore_delete (tty->rawInBuf.Semaphore);
free (tty->rawInBuf.theBuf);
free (tty->rawOutBuf.theBuf);
free (tty->cbuf);
free (tty);
}
rtems_semaphore_release (rtems_termios_ttyMutex);