summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-11 21:21:43 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-10-11 21:21:43 +0000
commit38db58f82b958ad5dc75d38a57491419d1f26978 (patch)
tree9f4793130041c5fefac4f9b850721aa2ed6f6a69 /cpukit
parentc682b89389b53d65b4aff8254f04522d4f1bcf2d (diff)
downloadrtems-38db58f82b958ad5dc75d38a57491419d1f26978.tar.bz2
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.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libcsupport/src/termios.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/cpukit/libcsupport/src/termios.c b/cpukit/libcsupport/src/termios.c
index 37a9e77213..0a04783648 100644
--- a/cpukit/libcsupport/src/termios.c
+++ b/cpukit/libcsupport/src/termios.c
@@ -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);