devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Slightly improve http_download related allocations.

Browse Source 
* use `calloc()` to allocate zero-initialized structs.
* order the allocation of members by their declaration.
* order the freeing of members in reverse order.
* move init of `silent` flag in plugin case.
* fix double free of `tmpname` in `aesgcm_file_get()`.
* make some functions static.

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2025-03-18 13:00:01 +01:00
parent cffd310744
commit 422f5fa6f9
4 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/command/cmd_funcs.c
View File

@@ -9435,17 +9435,16 @@ _url_aesgcm_method(ProfWin* window, const char* cmd_template, gchar* url, gchar*
auto_gchar gchar* filename = _prepare_filename(window, url, path);
if (!filename)
return;
auto_char char* id = get_random_string(4);
AESGCMDownload* download = malloc(sizeof(AESGCMDownload));
download->window = window;
AESGCMDownload* download = calloc(1, sizeof(AESGCMDownload));
download->id = get_random_string(4);
download->url = strdup(url);
download->filename = strdup(filename);
download->id = strdup(id);
if (cmd_template != NULL) {
download->cmd_template = strdup(cmd_template);
} else {
download->cmd_template = NULL;
}
download->window = window;
pthread_create(&(download->worker), NULL, &aesgcm_file_get, download);
aesgcm_download_add_download(download);
@@ -9458,38 +9457,38 @@ _download_install_plugin(ProfWin* window, gchar* url, gchar* path)
auto_gchar gchar* filename = _prepare_filename(window, url, path);
if (!filename)
return FALSE;
HTTPDownload* download = malloc(sizeof(HTTPDownload));
download->window = window;
HTTPDownload* download = calloc(1, sizeof(HTTPDownload));
download->id = get_random_string(4);
download->url = strdup(url);
download->filename = strdup(filename);
download->id = get_random_string(4);
download->cmd_template = NULL;
download->window = window;
download->silent = TRUE;
pthread_create(&(download->worker), NULL, &plugin_download_install, download);
plugin_download_add_download(download);
return TRUE;
}
void
static void
_url_http_method(ProfWin* window, const char* cmd_template, gchar* url, gchar* path)
{
auto_gchar gchar* filename = _prepare_filename(window, url, path);
if (!filename)
return;
auto_char char* id = get_random_string(4);
HTTPDownload* download = malloc(sizeof(HTTPDownload));
download->window = window;
HTTPDownload* download = calloc(1, sizeof(HTTPDownload));
download->id = get_random_string(4);
download->url = strdup(url);
download->filename = strdup(filename);
download->id = strdup(id);
download->cmd_template = cmd_template ? strdup(cmd_template) : NULL;
download->window = window;
download->silent = FALSE;
pthread_create(&(download->worker), NULL, &http_file_get, download);
http_download_add_download(download);
}
void
static void
_url_external_method(const char* cmd_template, const char* url, gchar* filename)
{
auto_gcharv gchar** argv = format_call_external_argv(cmd_template, url, filename);