From 2c5f499364bc8fab39fa4346b7a9dfc7c029b4bc Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Tue, 9 Aug 2005 17:41:31 +0000 Subject: [PATCH] Move pgp failure check inside the if (invoke pgp) block. Should really Close: 2032. --- pgp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pgp.c b/pgp.c index 564ecfc82..55f90ce94 100644 --- a/pgp.c +++ b/pgp.c @@ -378,16 +378,17 @@ void pgp_application_pgp_handler (BODY *m, STATE *s) state_attach_puts (_("[-- End of PGP output --]\n\n"), s); } } - } - - /* treat empty result as sign of failure */ - if (!(pgpout && ftell(pgpout))) - { - mutt_error _("Could not decrypt PGP message"); - pgp_void_passphrase (); - goto out; + /* treat empty result as sign of failure */ + if (!(pgpout && ftell(pgpout))) + { + mutt_error _("Could not decrypt PGP message"); + pgp_void_passphrase (); + + goto out; + } } + /* * Now, copy cleartext to the screen. NOTE - we expect that PGP * outputs utf-8 cleartext. This may not always be true, but it -- 2.40.0