devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-08-02 08:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optionally return bytes received from http_file_get()

Browse Source 
`http_dl->bytes_received` was already free'd when it was accessed inside
`aesgcm_file_get()`.

Change `http_file_get()` to optionally return the number of bytes received
so we know how much data we have to decrypt.

This fixes #1994

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2025-03-18 14:24:59 +01:00
parent 422f5fa6f9
commit 4405f33884
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/aesgcm_download.c
View File

@@ -109,9 +109,15 @@ aesgcm_file_get(void* userdata)
http_dl->filename = strdup(tmpname);
http_dl->cmd_template = NULL;
http_dl->silent = FALSE;
http_dl->return_bytes_received = TRUE;
aesgcm_dl->http_dl = http_dl;
http_file_get(http_dl); // TODO(wstrm): Verify result.
ssize_t* p_bytes_received = http_file_get(http_dl);
if (!p_bytes_received) {
return NULL;
}
ssize_t bytes_received = *p_bytes_received;
free(p_bytes_received);
auto_FILE FILE* tmpfh = fopen(tmpname, "rb");
if (tmpfh == NULL) {
@@ -125,7 +131,7 @@ aesgcm_file_get(void* userdata)
gcry_error_t crypt_res;
crypt_res = omemo_decrypt_file(tmpfh, outfh,
http_dl->bytes_received, fragment);
bytes_received, fragment);
remove(tmpname);