X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pgp.c;h=1e1d2b58e6d38847c314fa0be0c520dccfb6a658;hb=0e654d058aa2b5027166bd3e535f85bbc4f214dc;hp=995ec13e2f9b816515a110fd612357450872a6a8;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258;p=apps%2Fmadmutt.git diff --git a/pgp.c b/pgp.c index 995ec13..1e1d2b5 100644 --- a/pgp.c +++ b/pgp.c @@ -26,6 +26,7 @@ #include "pgp.h" #include "mime.h" #include "copy.h" +#include "attach.h" #include "lib/mem.h" #include "lib/intl.h" @@ -361,14 +362,13 @@ 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 !=NULL) - if (! ftell(pgpout)) { - mutt_error _("Could not decrypt PGP message"); - goto out; + /* treat empty result as sign of failure */ + if (!(pgpout && ftell (pgpout))) { + mutt_error _("Could not decrypt PGP message"); + goto out; } + } /* * Now, copy cleartext to the screen. NOTE - we expect that PGP