Fix incorrect usage of maxlen argument in snprintf calls

12 files changed, 35 insertions, 33 deletions

diff --git a/src/lib/core/artifactory.c b/src/lib/core/artifactory.c
index 918b24e..9e41046 100644
--- a/src/lib/core/artifactory.c
+++ b/src/lib/core/artifactory.c
@@ -44,7 +44,7 @@ int artifactory_download_cli(char *dest,
         return -1;
     }
 
-    snprintf(url, sizeof(url) - 1, "%s/%s/%s/%s/%s-%s-%s/%s",
+    snprintf(url, sizeof(url), "%s/%s/%s/%s/%s-%s-%s/%s",
              jfrog_artifactory_base_url,           // https://releases.jfrog.io/artifactory
              jfrog_artifactory_product,            // jfrog-cli
              cli_major_ver,                        // v\d+(-jf)?
@@ -102,7 +102,7 @@ void jfrt_register_opt_int(int jfrt_val, const char *opt_name, struct StrList **
         // option will not be used
         return;
     }
-    snprintf(data, sizeof(data) - 1, "--%s=%d", opt_name, jfrt_val);
+    snprintf(data, sizeof(data), "--%s=%d", opt_name, jfrt_val);
     strlist_append(&*opt_map, data);
 }
 
@@ -113,7 +113,7 @@ void jfrt_register_opt_long(long jfrt_val, const char *opt_name, struct StrList
         // option will not be used
         return;
     }
-    snprintf(data, sizeof(data) - 1, "--%s=%ld", opt_name, jfrt_val);
+    snprintf(data, sizeof(data), "--%s=%ld", opt_name, jfrt_val);
     strlist_append(&*opt_map, data);
 }
 
@@ -232,7 +232,7 @@ int jfrog_cli(struct JFRT_Auth *auth, const char *subsystem, const char *task, c
             auth->client_cert_path,
             auth->password,
     };
-    snprintf(cmd, sizeof(cmd) - 1, "jf %s %s %s %s", subsystem, task, auth_args, args ? args : "");
+    snprintf(cmd, sizeof(cmd), "jf %s %s %s %s", subsystem, task, auth_args, args ? args : "");
     redact_sensitive(redactable, sizeof(redactable) / sizeof (*redactable), cmd, cmd_redacted, sizeof(cmd_redacted) - 1);
 
     guard_free(auth_args);
@@ -256,13 +256,13 @@ static int jfrog_cli_rt(struct JFRT_Auth *auth, char *task, char *args) {
 
 int jfrog_cli_rt_build_collect_env(struct JFRT_Auth *auth, char *build_name, char *build_number) {
     char cmd[STASIS_BUFSIZ] = {0};
-    snprintf(cmd, sizeof(cmd) - 1, "\"%s\" \"%s\"", build_name, build_number);
+    snprintf(cmd, sizeof(cmd), "\"%s\" \"%s\"", build_name, build_number);
     return jfrog_cli(auth, "rt", "build-collect-env", cmd);
 }
 
 int jfrog_cli_rt_build_publish(struct JFRT_Auth *auth, char *build_name, char *build_number) {
     char cmd[STASIS_BUFSIZ] = {0};
-    snprintf(cmd, sizeof(cmd) - 1, "\"%s\" \"%s\"", build_name, build_number);
+    snprintf(cmd, sizeof(cmd), "\"%s\" \"%s\"", build_name, build_number);
     return jfrog_cli(auth, "rt", "build-publish", cmd);
 }
 
@@ -328,7 +328,7 @@ int jfrog_cli_rt_download(struct JFRT_Auth *auth, struct JFRT_Download *ctx, cha
         return -1;
     }
 
-    snprintf(cmd, sizeof(cmd) - 1, "%s '%s' '%s'", args, repo_path, dest ? dest : "");
+    snprintf(cmd, sizeof(cmd), "%s '%s' '%s'", args, repo_path, dest ? dest : "");
     guard_free(args);
     guard_strlist_free(&arg_map);
 
@@ -418,7 +418,7 @@ int jfrog_cli_rt_upload(struct JFRT_Auth *auth, struct JFRT_Upload *ctx, char *s
         pushd(new_src);
     }
 
-    snprintf(cmd, sizeof(cmd) - 1, "%s '%s' \"%s\"", args, src, repo_path);
+    snprintf(cmd, sizeof(cmd), "%s '%s' \"%s\"", args, src, repo_path);
     guard_free(args);
     guard_strlist_free(&arg_map);
 
@@ -477,7 +477,7 @@ int jfrog_cli_rt_search(struct JFRT_Auth *auth, struct JFRT_Search *ctx, char *r
         return -1;
     }
 
-    snprintf(cmd, sizeof(cmd) - 1, "%s '%s/%s'", args, repo_path, pattern ? pattern: "");
+    snprintf(cmd, sizeof(cmd), "%s '%s/%s'", args, repo_path, pattern ? pattern: "");
     guard_free(args);
     guard_strlist_free(&arg_map);
 
diff --git a/src/lib/core/conda.c b/src/lib/core/conda.c
index a12bdee..90c6ba1 100644
--- a/src/lib/core/conda.c
+++ b/src/lib/core/conda.c
@@ -177,15 +177,15 @@ int pkg_index_provides(int mode, const char *index, const char *spec) {
         // The --force argument ignores local installation and cache, and actually polls the remote index(es)
         strncpy(cmd, "python -m pip install --force --dry-run --no-cache --no-deps ", sizeof(cmd) - 1);
         if (index) {
-            snprintf(cmd + strlen(cmd), (sizeof(cmd) - 1) - strlen(cmd), "--index-url='%s' ", index);
+            snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd), "--index-url='%s' ", index);
         }
-        snprintf(cmd + strlen(cmd), (sizeof(cmd) - 1) - strlen(cmd), "'%s' ", spec_local);
+        snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd), "'%s' ", spec_local);
     } else if (mode == PKG_USE_CONDA) {
         strncpy(cmd, "mamba search ", sizeof(cmd) - 1);
         if (index) {
-            snprintf(cmd + strlen(cmd), (sizeof(cmd) - 1) - strlen(cmd), "--channel '%s' ", index);
+            snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd), "--channel '%s' ", index);
         }
-        snprintf(cmd + strlen(cmd), (sizeof(cmd) - 1) - strlen(cmd), "'%s' ", spec_local);
+        snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd), "'%s' ", spec_local);
     } else {
         return PKG_INDEX_PROVIDES_E_INTERNAL_MODE_UNKNOWN;
     }
diff --git a/src/lib/core/docker.c b/src/lib/core/docker.c
index 37ef48d..52599d3 100644
--- a/src/lib/core/docker.c
+++ b/src/lib/core/docker.c
@@ -7,7 +7,7 @@ int docker_exec(const char *args, const unsigned flags) {
 
     memset(&proc, 0, sizeof(proc));
     memset(cmd, 0, sizeof(cmd));
-    snprintf(cmd, sizeof(cmd) - 1, "docker %s", args);
+    snprintf(cmd, sizeof(cmd), "docker %s", args);
 
     unsigned final_flags = 0;
     if (flags & STASIS_DOCKER_QUIET) {
@@ -36,7 +36,7 @@ int docker_script(const char *image, char *args, char *data, const unsigned flag
     (void)flags;  // TODO: placeholder
     char cmd[PATH_MAX] = {0};
 
-    snprintf(cmd, sizeof(cmd) - 1, "docker run -i %s \"%s\" /bin/sh -", args ? args : "", image);
+    snprintf(cmd, sizeof(cmd), "docker run -i %s \"%s\" /bin/sh -", args ? args : "", image);
 
     FILE *outfile = popen(cmd, "w");
     if (!outfile) {
diff --git a/src/lib/core/multiprocessing.c b/src/lib/core/multiprocessing.c
index 2bf33dd..92970f0 100644
--- a/src/lib/core/multiprocessing.c
+++ b/src/lib/core/multiprocessing.c
@@ -363,7 +363,7 @@ int mp_pool_join(struct MultiProcessingPool *pool, size_t jobs, size_t flags) {
 
             char progress[1024] = {0};
             const double percent = ((double) (tasks_complete + 1) / (double) pool->num_used) * 100;
-            snprintf(progress, sizeof(progress) - 1, "[%s:%s] [%3.1f%%]", pool->ident, slot->ident, percent);
+            snprintf(progress, sizeof(progress), "[%s:%s] [%3.1f%%]", pool->ident, slot->ident, percent);
 
             int task_timed_out = false;
             if (slot->timeout) {
diff --git a/src/lib/core/utils.c b/src/lib/core/utils.c
index 16f9dbe..f65a1d8 100644
--- a/src/lib/core/utils.c
+++ b/src/lib/core/utils.c
@@ -601,7 +601,7 @@ int xml_pretty_print_in_place(const char *filename, const char *pretty_print_pro
         return 0;
     }
     memset(cmd, 0, sizeof(cmd));
-    snprintf(cmd, sizeof(cmd) - 1, "%s %s %s", pretty_print_prog, pretty_print_args, filename);
+    snprintf(cmd, sizeof(cmd), "%s %s %s", pretty_print_prog, pretty_print_args, filename);
     result = shell_output(cmd, &status);
     if (status || !result) {
         goto pretty_print_failed;
@@ -950,7 +950,7 @@ void debug_hexdump(char *data, int len) {
 
         const char *ascii_fmt = "%c";
         // no need to calculate length for a single character
-        snprintf(ascii + strlen(ascii), sizeof(ascii) - 1, ascii_fmt, isprint(*pos) ? *pos : '.');
+        snprintf(ascii + strlen(ascii), sizeof(ascii) - strlen(ascii), ascii_fmt, isprint(*pos) ? *pos : '.');
 
         pos++;
         count++;
diff --git a/src/lib/delivery/delivery_artifactory.c b/src/lib/delivery/delivery_artifactory.c
index ca35005..0a74241 100644
--- a/src/lib/delivery/delivery_artifactory.c
+++ b/src/lib/delivery/delivery_artifactory.c
@@ -4,8 +4,8 @@ int delivery_init_artifactory(struct Delivery *ctx) {
     int status = 0;
     char dest[PATH_MAX] = {0};
     char filepath[PATH_MAX] = {0};
-    snprintf(dest, sizeof(dest) - 1, "%s/bin", ctx->storage.tools_dir);
-    snprintf(filepath, sizeof(dest) - 1, "%s/bin/jf", ctx->storage.tools_dir);
+    snprintf(dest, sizeof(dest), "%s/bin", ctx->storage.tools_dir);
+    snprintf(filepath, sizeof(dest), "%s/bin/jf", ctx->storage.tools_dir);
 
     if (!access(filepath, F_OK)) {
         // already have it
@@ -32,7 +32,7 @@ int delivery_init_artifactory(struct Delivery *ctx) {
 
     // JFROG_CLI_HOME_DIR is where .jfrog is stored
     char path[PATH_MAX] = {0};
-    snprintf(path, sizeof(path) - 1, "%s/.jfrog", ctx->storage.build_dir);
+    snprintf(path, sizeof(path), "%s/.jfrog", ctx->storage.build_dir);
     setenv("JFROG_CLI_HOME_DIR", path, 1);
 
     // JFROG_CLI_TEMP_DIR is where the obvious is stored
@@ -84,8 +84,8 @@ int delivery_artifact_upload(struct Delivery *ctx) {
             for (size_t f = 0; f < strlist_count(ctx->deploy.jfrog[i].files); f++) {
                 char dest[PATH_MAX] = {0};
                 char files[PATH_MAX] = {0};
-                snprintf(dest, sizeof(dest) - 1, "%s/%s", ctx->deploy.jfrog[i].repo, ctx->deploy.jfrog[i].dest);
-                snprintf(files, sizeof(files) - 1, "%s", strlist_item(ctx->deploy.jfrog[i].files, f));
+                snprintf(dest, sizeof(dest), "%s/%s", ctx->deploy.jfrog[i].repo, ctx->deploy.jfrog[i].dest);
+                snprintf(files, sizeof(files), "%s", strlist_item(ctx->deploy.jfrog[i].files, f));
                 status += jfrog_cli_rt_upload(&ctx->deploy.jfrog_auth, &ctx->deploy.jfrog[i].upload_ctx, files, dest);
             }
         }
diff --git a/src/lib/delivery/delivery_conda.c b/src/lib/delivery/delivery_conda.c
index 79aa1dc..d6898a4 100644
--- a/src/lib/delivery/delivery_conda.c
+++ b/src/lib/delivery/delivery_conda.c
@@ -72,7 +72,7 @@ void delivery_install_conda(char *install_script, char *conda_install_dir) {
             // Proceed with the installation
             // -b = batch mode (non-interactive)
             char cmd[PATH_MAX] = {0};
-            snprintf(cmd, sizeof(cmd) - 1, "%s %s -b -p %s",
+            snprintf(cmd, sizeof(cmd), "%s %s -b -p %s",
                      find_program("bash"),
                      install_script,
                      conda_install_dir);
@@ -84,7 +84,7 @@ void delivery_install_conda(char *install_script, char *conda_install_dir) {
             // Proceed with the installation
             // -b = batch mode (non-interactive)
             char cmd[PATH_MAX] = {0};
-            snprintf(cmd, sizeof(cmd) - 1, "%s %s -b -p %s",
+            snprintf(cmd, sizeof(cmd), "%s %s -b -p %s",
                      find_program("bash"),
                      install_script,
                      conda_install_dir);
diff --git a/src/lib/delivery/delivery_postprocess.c b/src/lib/delivery/delivery_postprocess.c
index d0027e7..8cb4e65 100644
--- a/src/lib/delivery/delivery_postprocess.c
+++ b/src/lib/delivery/delivery_postprocess.c
@@ -186,7 +186,7 @@ int delivery_copy_conda_artifacts(struct Delivery *ctx) {
         return 0;
     }
 
-    snprintf(cmd, sizeof(cmd) - 1, "rsync -avi --progress %s/%s %s",
+    snprintf(cmd, sizeof(cmd), "rsync -avi --progress %s/%s %s",
              conda_build_dir,
              ctx->system.platform[DELIVERY_PLATFORM_CONDA_SUBDIR],
              ctx->storage.conda_artifact_dir);
@@ -200,7 +200,7 @@ int delivery_index_conda_artifacts(struct Delivery *ctx) {
 
 int delivery_copy_wheel_artifacts(struct Delivery *ctx) {
     char cmd[PATH_MAX] = {0};
-    snprintf(cmd, sizeof(cmd) - 1, "rsync -avi --progress %s/*/dist/*.whl %s",
+    snprintf(cmd, sizeof(cmd), "rsync -avi --progress %s/*/dist/*.whl %s",
              ctx->storage.build_sources_dir,
              ctx->storage.wheel_artifact_dir);
     return system(cmd);
diff --git a/tests/test_artifactory.c b/tests/test_artifactory.c
index 0d84289..fadc9f1 100644
--- a/tests/test_artifactory.c
+++ b/tests/test_artifactory.c
@@ -15,14 +15,14 @@ const char *gbuild_num = "1";
 static int jfrog_cli_rt_build_delete(struct JFRT_Auth *auth, char *build_name, char *build_num) {
     char cmd[STASIS_BUFSIZ];
     memset(cmd, 0, sizeof(cmd));
-    snprintf(cmd, sizeof(cmd) - 1, "--build \"%s/%s\"", build_name, build_num);
+    snprintf(cmd, sizeof(cmd), "--build \"%s/%s\"", build_name, build_num);
     return jfrog_cli(auth, "rt", "delete", cmd);
 }
 
 static int jfrog_cli_rt_delete(struct JFRT_Auth *auth, char *pattern) {
     char cmd[STASIS_BUFSIZ];
     memset(cmd, 0, sizeof(cmd));
-    snprintf(cmd, sizeof(cmd) - 1, "\"%s\"", pattern);
+    snprintf(cmd, sizeof(cmd), "\"%s\"", pattern);
     return jfrog_cli(auth, "rt", "delete", cmd);
 }
 
diff --git a/tests/test_junitxml.c b/tests/test_junitxml.c
index 362cb32..0bbbefb 100644
--- a/tests/test_junitxml.c
+++ b/tests/test_junitxml.c
@@ -4,7 +4,7 @@
 void test_junitxml_testsuite_read() {
     struct JUNIT_Testsuite *testsuite;
     char datafile[PATH_MAX] = {0};
-    snprintf(datafile, sizeof(datafile) - 1, "%s/result.xml", TEST_DATA_DIR);
+    snprintf(datafile, sizeof(datafile), "%s/result.xml", TEST_DATA_DIR);
 
     STASIS_ASSERT_FATAL((testsuite = junitxml_testsuite_read(datafile)) != NULL, "failed to load testsuite data");
     STASIS_ASSERT(testsuite->name != NULL, "Test suite must be named");
@@ -48,7 +48,7 @@ void test_junitxml_testsuite_read() {
 void test_junitxml_testsuite_read_error() {
     struct JUNIT_Testsuite *testsuite;
     char datafile[PATH_MAX] = {0};
-    snprintf(datafile, sizeof(datafile) - 1, "%s/result_error.xml", TEST_DATA_DIR);
+    snprintf(datafile, sizeof(datafile), "%s/result_error.xml", TEST_DATA_DIR);
     STASIS_ASSERT_FATAL((testsuite = junitxml_testsuite_read(datafile)) != NULL, "failed to load testsuite data");
 
     STASIS_ASSERT(testsuite->name != NULL, "test suite must be named");
diff --git a/tests/test_multiprocessing.c b/tests/test_multiprocessing.c
index 3b98b77..767a9e0 100644
--- a/tests/test_multiprocessing.c
+++ b/tests/test_multiprocessing.c
@@ -137,7 +137,7 @@ void test_mp_fail_fast() {
     for (size_t i = 0; i < sizeof(commands_ff) / sizeof(*commands_ff); i++) {
         char *command = commands_ff[i];
         char taskname[100] = {0};
-        snprintf(taskname, sizeof(taskname) - 1, "task_%03zu", i);
+        snprintf(taskname, sizeof(taskname), "task_%03zu", i);
         STASIS_ASSERT(mp_pool_task(p, taskname, NULL, (char *) command) != NULL, "Failed to queue task");
     }
 
diff --git a/tests/test_utils.c b/tests/test_utils.c
index 79bca43..7361139 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -147,7 +147,9 @@ void test_xmkstemp() {
 
     char buf[100] = {0};
     tempfp = fopen(tempfile, "r");
-    fgets(buf, sizeof(buf) - 1, tempfp);
+    const char *line = fgets(buf, sizeof(buf) - 1, tempfp);
+    STASIS_ASSERT_FATAL(line != NULL, "file should contain data written earlier");
+    STASIS_ASSERT(strcmp(line, buf) == 0, "file should contain the correct data");
     fclose(tempfp);
 
     STASIS_ASSERT(strcmp(buf, data) == 0, "data written to temp file is incorrect");