[svn] GnuPG - r4449 - trunk/g10

[svn author wk]

Author: wk
Date: 2007-03-08 13:11:58 +0100 (Thu, 08 Mar 2007)
New Revision: 4449

Modified:
   trunk/g10/ChangeLog
   trunk/g10/plaintext.c
Log:
Add extra flushs


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-03-08 07:39:57 UTC (rev 4448)
+++ trunk/g10/ChangeLog	2007-03-08 12:11:58 UTC (rev 4449)
@@ -1,3 +1,7 @@
+2007-03-08  Werner Koch  <wk at g10code.com>
+
+	* plaintext.c (handle_plaintext): Add two extra fflush for stdout.
+
 2007-03-08  David Shaw  <dshaw at jabberwocky.com>  (wk)
 
 	* keyedit.c (keyedit_menu): If we modify the keyblock (via

Modified: trunk/g10/plaintext.c
===================================================================
--- trunk/g10/plaintext.c	2007-03-08 07:39:57 UTC (rev 4448)
+++ trunk/g10/plaintext.c	2007-03-08 12:11:58 UTC (rev 4449)
@@ -69,6 +69,12 @@
       {
 	char status[50];
 
+        /* Better make sure that stdout has been flushed in case the
+           output will be written to it.  This is to make sure that no
+           not-yet-flushed stuff will be written after the plaintext
+           status message.  */
+        fflush (stdout);
+
 	sprintf(status,"%X %lu ",(byte)pt->mode,(ulong)pt->timestamp);
 	write_status_text_and_buffer(STATUS_PLAINTEXT,
 				     status,pt->name,pt->namelen,0);
@@ -394,8 +400,13 @@
     fp = NULL;
 
   leave:
+    /* Make sure that stdout gets flushed after the plaintext has
+       been handled.  This is for extra security as we do a
+       flush anyway before checking the signature.  */
+    fflush (stdout);
+
     if( fp && fp != stdout )
-	fclose(fp);
+      fclose (fp);
     xfree(fname);
     return rc;
 }