Changeset 38db58f in rtems

Timestamp:

10/11/01 21:21:43 (22 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

ba71076

Parents:

c682b89

Message:

2001-10-11 Mike Siers <mikes@…>

• 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.

Files:

• c/src/exec/libcsupport/src/termios.c (modified) (3 diffs)
• c/src/lib/ChangeLog (modified) (1 diff)
• c/src/lib/libc/termios.c (modified) (3 diffs)
• cpukit/libcsupport/src/termios.c (modified) (3 diffs)

c/src/exec/libcsupport/src/termios.c

@@ -199 +199 @@
                 tty->tty_rcv.sw_arg = NULL;
                 tty->tty_rcvwakeup  = 0;
+
                 /*
                  * link tty
                  */
-                if (rtems_termios_ttyHead)
+                tty->forw = rtems_termios_ttyHead;
+                tty->back = NULL;
+                if (rtems_termios_ttyHead != NULL)
                         rtems_termios_ttyHead->back = tty;
-                tty->forw = rtems_termios_ttyHead;
                 rtems_termios_ttyHead = tty;
                 if (rtems_termios_ttyTail == NULL)
                         rtems_termios_ttyTail = tty;
+
                 tty->minor = minor;
                 tty->major = major;
@@ -412 +415 @@
                 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);
@@ -426 +439 @@
                     (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);
         }

c/src/lib/ChangeLog

@@ +1 @@
+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>
 

c/src/lib/libc/termios.c

@@ -199 +199 @@
                 tty->tty_rcv.sw_arg = NULL;
                 tty->tty_rcvwakeup  = 0;
+
                 /*
                  * link tty
                  */
-                if (rtems_termios_ttyHead)
+                tty->forw = rtems_termios_ttyHead;
+                tty->back = NULL;
+                if (rtems_termios_ttyHead != NULL)
                         rtems_termios_ttyHead->back = tty;
-                tty->forw = rtems_termios_ttyHead;
                 rtems_termios_ttyHead = tty;
                 if (rtems_termios_ttyTail == NULL)
                         rtems_termios_ttyTail = tty;
+
                 tty->minor = minor;
                 tty->major = major;
@@ -412 +415 @@
                 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);
@@ -426 +439 @@
                     (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);
         }

cpukit/libcsupport/src/termios.c

@@ -199 +199 @@
                 tty->tty_rcv.sw_arg = NULL;
                 tty->tty_rcvwakeup  = 0;
+
                 /*
                  * link tty
                  */
-                if (rtems_termios_ttyHead)
+                tty->forw = rtems_termios_ttyHead;
+                tty->back = NULL;
+                if (rtems_termios_ttyHead != NULL)
                         rtems_termios_ttyHead->back = tty;
-                tty->forw = rtems_termios_ttyHead;
                 rtems_termios_ttyHead = tty;
                 if (rtems_termios_ttyTail == NULL)
                         rtems_termios_ttyTail = tty;
+
                 tty->minor = minor;
                 tty->major = major;
@@ -412 +415 @@
                 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);
@@ -426 +439 @@
                     (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);
         }