From 3566b4c666a3a66c1cf0ca305c3d4998ef74d5b4 Mon Sep 17 00:00:00 2001 From: Marco Sirabella Date: Fri, 22 Jun 2018 14:10:36 -0400 Subject: [PATCH] Remove ftmpname from smime_handle_cert_email --- ncrypt/smime.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ncrypt/smime.c b/ncrypt/smime.c index 56cdff95a..9419ea5c0 100644 --- a/ncrypt/smime.c +++ b/ncrypt/smime.c @@ -962,30 +962,25 @@ char *smime_class_find_keys(struct Address *addrlist, bool oppenc_mode) static int smime_handle_cert_email(char *certificate, char *mailbox, int copy, char ***buffer, int *num) { - char tmpfname[PATH_MAX]; char email[STRING]; int rc = -1, count = 0; pid_t thepid; size_t len = 0; - mutt_mktemp(tmpfname, sizeof(tmpfname)); - FILE *fperr = mutt_file_fopen(tmpfname, "w+"); + FILE *fperr = mutt_file_mkstemp(); if (!fperr) { - mutt_perror(tmpfname); + mutt_perror("mutt_file_mkstemp() failed!"); return 1; } - mutt_file_unlink(tmpfname); - mutt_mktemp(tmpfname, sizeof(tmpfname)); - FILE *fpout = mutt_file_fopen(tmpfname, "w+"); + FILE *fpout = mutt_file_mkstemp(); if (!fpout) { mutt_file_fclose(&fperr); - mutt_perror(tmpfname); + mutt_perror("mutt_file_mkstemp() failed!"); return 1; } - mutt_file_unlink(tmpfname); thepid = smime_invoke(NULL, NULL, NULL, -1, fileno(fpout), fileno(fperr), certificate, NULL, NULL, NULL, NULL, NULL, NULL, SmimeGetCertEmailCommand); -- 2.40.0