diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/plaintext.c | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 8e17c4e31..a5d017f92 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2007-03-08 Werner Koch <[email protected]> + + * plaintext.c (handle_plaintext): Add two extra fflush for stdout. + 2007-03-08 David Shaw <[email protected]> (wk) * keyedit.c (keyedit_menu): If we modify the keyblock (via diff --git a/g10/plaintext.c b/g10/plaintext.c index 6c58ae7d7..fd165237e 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -69,6 +69,12 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, { 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 @@ handle_plaintext( PKT_plaintext *pt, md_filter_context_t *mfx, 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; } |