Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/stdio/current/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -5 -p -r1.43 -r1.44
--- ChangeLog	21 Jul 2008 10:38:23 -0000	1.43
+++ ChangeLog	15 Jan 2009 03:33:52 -0000	1.44
@@ -1,5 +1,11 @@
+2009-01-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* src/common/fflush.cxx (cyg_libc_stdio_flush_all_but): Ensure the
+	files table can't change. Thanks to Xiaochen Zhou for the detective
+	work.
+
 2008-07-21  Guenter Ebermann  <guenter.ebermann@gmx.at>
 
 	* src/common/fclose.cxx (fclose): Replace config-dependent use of
 	delete with free(), as the memory had been allocated with malloc.
 
Index: src/common/fflush.cxx
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/stdio/current/src/common/fflush.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -5 -p -r1.7 -r1.8
--- src/common/fflush.cxx	15 Mar 2004 15:21:44 -0000	1.7
+++ src/common/fflush.cxx	15 Jan 2009 03:33:52 -0000	1.8
@@ -80,11 +80,15 @@ cyg_libc_stdio_flush_all_but( Cyg_StdioS
     do {
         loop_again = false;
 
         for (i=0; (i<FOPEN_MAX) && !err; i++) {
             if (files_flushed[i] == false) {
-                
+                // Don't let the files table change e.g. by closing the file.
+                if ( Cyg_libc_stdio_files::lock() ) {
+                    err = EINTR;
+                    break;
+                }
                 stream = Cyg_libc_stdio_files::get_file_stream(i);
                 
                 if ((stream == NULL) || (stream == not_this_stream)) {
                     // if it isn't a valid stream, set its entry in the
                     // list of files flushed since we don't want to
@@ -116,10 +120,14 @@ cyg_libc_stdio_flush_all_but( Cyg_StdioS
                             loop_again = true;
                             looped = true;
                         }
                     }
                 } // else
+                // We can unlock and relock every loop as we only care
+                // about flushing streams that were open prior to this
+                // call. Any new streams can be ignored.
+                Cyg_libc_stdio_files::unlock()
             } // if
         } // for
     } // do
     while(loop_again && !err);