aniani/profanity
0
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-07-25 10:44:23 -04:00
Code

Remove temporary ciphertext file when finished

Browse Source
This commit is contained in:
William Wennerström 2020-06-28 15:45:19 +02:00
parent 9d58472c8c
commit 04bfa23ead
No known key found for this signature in database
GPG Key ID: E1382990BEDD319B
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/cmd_funcs.c
View File

@ -4862,7 +4862,8 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
// Create temporary file for writing ciphertext. // Create temporary file for writing ciphertext.
int tmpfd; int tmpfd;
if ((tmpfd = g_file_open_tmp("profanity.XXXXXX", NULL, NULL)) == -1) { char *tmpname = NULL;
if ((tmpfd = g_file_open_tmp("profanity.XXXXXX", &tmpname, NULL)) == -1) {
char *msg = "Unable to create temporary file for encrypted transfer."; char *msg = "Unable to create temporary file for encrypted transfer.";
cons_show_error(msg); cons_show_error(msg);
win_println(window, THEME_ERROR, "-", msg); win_println(window, THEME_ERROR, "-", msg);
@ -4871,6 +4872,11 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
} }
FILE *tmpfh = fdopen(tmpfd, "wb"); FILE *tmpfh = fdopen(tmpfd, "wb");
// The temporary ciphertext file should be removed upon closure
// later.
remove(tmpname);
free(tmpname);
int crypt_res; int crypt_res;
alt_scheme = OMEMO_AESGCM_URL_SCHEME; alt_scheme = OMEMO_AESGCM_URL_SCHEME;
alt_fragment = omemo_encrypt_file(fh, tmpfh, file_size(fd), &crypt_res); alt_fragment = omemo_encrypt_file(fh, tmpfh, file_size(fd), &crypt_res);
@ -4889,7 +4895,7 @@ cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
fclose(fh); // Also closes descriptor. fclose(fh); // Also closes descriptor.
// Switch original stream with temporary encrypted stream. // Switch original stream with temporary ciphertext stream.
fd = tmpfd; fd = tmpfd;
fh = tmpfh; fh = tmpfh;