Changeset c9a4da01 in rtems

Timestamp:

11/26/03 17:53:30 (20 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

d16b2d3

Parents:

690861c

Message:

2003-11-26 Joel Sherrill <joel@…>

PR 524/filesystem

• src/newlibc.c: Address 1K buffer leak from incomplete cleanup of newlib reentrancy handler.

Location:

cpukit/libcsupport

Files:

• ChangeLog (modified) (1 diff)
• src/newlibc.c (modified) (3 diffs)

cpukit/libcsupport/ChangeLog

@@ +1 @@
+2003-11-26      Joel Sherrill <joel@OARcorp.com>
+
+        PR 524/filesystem
+        * src/newlibc.c: Address 1K buffer leak from incomplete cleanup of
+        newlib reentrancy handler.
+
 2003-11-26      Joel Sherrill <joel@OARcorp.com>
 

cpukit/libcsupport/src/newlibc.c

@@ -42 +42 @@
  
 #include <stdio.h>
+
+int _fwalk(struct _reent *ptr, int (*function) (FILE *) );
 
 int              libc_reentrant;        /* do we think we are reentrant? */
@@ -197 +199 @@
  */
 
+int newlib_free_buffers(
+  FILE *fp
+)
+{
+  switch ( fileno(fp) ) {
+    case 0:
+    case 1:
+    case 2:
+      if (fp->_flags & __SMBF) {
+        free( fp->_bf._base );
+        fp->_flags &= ~__SMBF;
+        fp->_bf._base = fp->_p = (unsigned char *) NULL;
+      }
+      break;
+    default:
+     fclose(fp);
+  }
+  return 0;
+}
+
 rtems_extension libc_delete_hook(
   rtems_tcb *current_task,
@@ -216 +238 @@
   /* if (ptr) */
   if (ptr && ptr != &libc_global_reent) {
+/*
     _wrapup_reent(ptr);
     _reclaim_reent(ptr);
+*/
+    /*
+     *  Just in case there are some buffers lying around.
+     */ 
+    _fwalk(ptr, newlib_free_buffers);
 #if REENT_MALLOCED
     free(ptr);