From d5fa0c23542746c642a00d24956f20afa639392c Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Mon, 30 Sep 2024 12:48:49 -0400 Subject: Replace strlcpy with strncpy (maybe later) --- src/delivery_test.c | 4 ++-- src/multiprocessing.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/delivery_test.c b/src/delivery_test.c index a9153d3..e2bfe97 100644 --- a/src/delivery_test.c +++ b/src/delivery_test.c @@ -173,11 +173,11 @@ void delivery_tests_run(struct Delivery *ctx) { exit(1); } - strlcpy(cmd, test->script_setup, cmd_len); + strncpy(cmd, test->script_setup, cmd_len - 1); char *cmd_rendered = tpl_render(cmd); if (cmd_rendered) { if (strcmp(cmd_rendered, cmd) != 0) { - strlcpy(cmd, cmd_rendered, cmd_len); + strncpy(cmd, cmd_rendered, cmd_len - 1); cmd[strlen(cmd_rendered) ? strlen(cmd_rendered) - 1 : 0] = 0; } guard_free(cmd_rendered); diff --git a/src/multiprocessing.c b/src/multiprocessing.c index 5f5451e..38d85fc 100644 --- a/src/multiprocessing.c +++ b/src/multiprocessing.c @@ -112,7 +112,7 @@ struct MultiProcessingTask *mp_pool_task(struct MultiProcessingPool *pool, const if (isempty(working_dir)) { strcpy(slot->working_dir, "."); } else { - strcpy(slot->working_dir, working_dir); + strncpy(slot->working_dir, working_dir, PATH_MAX - 1); } // Create a temporary file to act as our intermediate command script -- cgit