From fd2e8d9d2bc3dcce3707823c0ec0643f066c0b3f Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Apr 2026 19:06:04 -0400 Subject: Fix incorrect size used by realloc --- src/lib/delivery/delivery_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/delivery/delivery_test.c b/src/lib/delivery/delivery_test.c index 3ba9d56..ce6d73d 100644 --- a/src/lib/delivery/delivery_test.c +++ b/src/lib/delivery/delivery_test.c @@ -21,10 +21,10 @@ int tests_add(struct Tests *tests, struct Test *x) { #ifdef DEBUG const size_t old_alloc = tests->num_alloc; #endif - struct Test **tmp = realloc(tests->test, tests->num_alloc++ * sizeof(*tests->test)); + struct Test **tmp = realloc(tests->test, tests->num_alloc++ * sizeof(**tests->test)); SYSDEBUG("Increasing size of test array: %zu -> %zu", old_alloc, tests->num_alloc); if (!tmp) { - SYSDEBUG("Failed to allocate %zu bytes for test array", tests->num_alloc * sizeof(*tests->test)); + SYSDEBUG("Failed to allocate %zu bytes for test array", tests->num_alloc * sizeof(**tests->test)); return -1; } tests->test = tmp; -- cgit From d25ffbedb80fc4e02945c518dcae91d3a5ef6db6 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Apr 2026 19:54:35 -0400 Subject: Expose tests_free() --- src/lib/delivery/include/delivery.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h index b5799ac..68f4b14 100644 --- a/src/lib/delivery/include/delivery.h +++ b/src/lib/delivery/include/delivery.h @@ -521,6 +521,12 @@ int tests_add(struct Tests *tests, struct Test *x); */ void test_free(struct Test **x); +/** + * Free a `Tests` structure + * @param x pointer to `Tests` + */ +void tests_free(struct Tests **x); + /** * Initialize a `Test` structure * @return an initialized `Test` structure -- cgit From 0268551a0c9b1e6cba422efa88f36cb8e663bd82 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Apr 2026 19:55:21 -0400 Subject: Check memory allocations on init --- src/lib/delivery/delivery_test.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/lib/delivery/delivery_test.c b/src/lib/delivery/delivery_test.c index ce6d73d..b879689 100644 --- a/src/lib/delivery/delivery_test.c +++ b/src/lib/delivery/delivery_test.c @@ -37,7 +37,14 @@ int tests_add(struct Tests *tests, struct Test *x) { struct Test *test_init() { struct Test *result = calloc(1, sizeof(*result)); + if (!result) { + return NULL; + } + result->runtime = calloc(1, sizeof(*result->runtime)); + if (!result->runtime) { + return NULL; + } return result; } -- cgit From 38010fc9eea2d914de8f3058979baace3f1d1e80 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Apr 2026 19:58:52 -0400 Subject: Move test free code from delivery.c:delivery_free() to delivery_test.c:test_free() --- src/lib/delivery/delivery.c | 20 +------------------- src/lib/delivery/delivery_test.c | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/lib/delivery/delivery.c b/src/lib/delivery/delivery.c index 11dd7b0..be6e8ff 100644 --- a/src/lib/delivery/delivery.c +++ b/src/lib/delivery/delivery.c @@ -230,25 +230,7 @@ void delivery_free(struct Delivery *ctx) { guard_strlist_free(&ctx->conda.pip_packages_purge); guard_strlist_free(&ctx->conda.wheels_packages); - for (size_t i = 0; ctx->tests && i < ctx->tests->num_used; i++) { - guard_free(ctx->tests->test[i]->name); - guard_free(ctx->tests->test[i]->version); - guard_free(ctx->tests->test[i]->repository); - guard_free(ctx->tests->test[i]->repository_info_ref); - guard_free(ctx->tests->test[i]->repository_info_tag); - guard_strlist_free(&ctx->tests->test[i]->repository_remove_tags); - guard_free(ctx->tests->test[i]->script); - guard_free(ctx->tests->test[i]->script_setup); - guard_free(ctx->tests->test[i]->build_recipe); - // test-specific runtime variables - guard_runtime_free(ctx->tests->test[i]->runtime->environ); - guard_free(ctx->tests->test[i]->runtime); - guard_free(ctx->tests->test[i]); - } - if (ctx->tests) { - guard_free(ctx->tests->test); - guard_free(ctx->tests); - } + tests_free(&ctx->tests); guard_free(ctx->rules.release_fmt); guard_free(ctx->rules.build_name_fmt); diff --git a/src/lib/delivery/delivery_test.c b/src/lib/delivery/delivery_test.c index b879689..ca40b00 100644 --- a/src/lib/delivery/delivery_test.c +++ b/src/lib/delivery/delivery_test.c @@ -51,14 +51,31 @@ struct Test *test_init() { void test_free(struct Test **x) { struct Test *test = *x; + if (!test) { + return; + } + guard_free(test->name); + guard_free(test->version); + guard_free(test->repository); + guard_free(test->repository_info_ref); + guard_free(test->repository_info_tag); + guard_strlist_free(&test->repository_remove_tags); + guard_free(test->script); + guard_free(test->script_setup); + guard_free(test->build_recipe); + // test-specific runtime variables + guard_runtime_free(test->runtime->environ); + guard_free(test->runtime); guard_free(test); } void tests_free(struct Tests **x) { - for (size_t i = 0; i < (*x)->num_alloc; i++) { - test_free(&(*x)->test[i]); + struct Tests *tests = *x; + for (size_t i = 0; i < tests->num_alloc; i++) { + test_free(&tests->test[i]); } - guard_free((*x)->test); + guard_free(tests->test); + guard_free(tests); } void delivery_tests_run(struct Delivery *ctx) { -- cgit From f9dcabc7cc5b098e7e6b7e0951dcd7467fdcece0 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 8 Apr 2026 20:24:19 -0400 Subject: Fix invalid printf formatter --- src/lib/delivery/delivery_build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/delivery/delivery_build.c b/src/lib/delivery/delivery_build.c index 0013e96..1454d9a 100644 --- a/src/lib/delivery/delivery_build.c +++ b/src/lib/delivery/delivery_build.c @@ -367,7 +367,7 @@ struct StrList *delivery_build_wheels(struct Delivery *ctx) { const int use_builder_manylinux = strcmp(globals.wheel_builder, "manylinux") == 0 && on_linux && docker_usable; if (!use_builder_build && !use_builder_cibuildwheel && !use_builder_manylinux) { - msg(STASIS_MSG_WARN, "Cannot build wheel for platform using: %\n", globals.wheel_builder); + msg(STASIS_MSG_WARN, "Cannot build wheel for platform using: %s\n", globals.wheel_builder); msg(STASIS_MSG_WARN, "Falling back to native toolchain.\n", globals.wheel_builder); use_builder_build = 1; } -- cgit From 33dc91ee4baa88aa678af0cb23cdd417c5a1144b Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 9 Apr 2026 02:03:36 -0400 Subject: Clear errno on touch --- src/lib/core/conda.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/lib/core/conda.c b/src/lib/core/conda.c index de6130f..c9be7a3 100644 --- a/src/lib/core/conda.c +++ b/src/lib/core/conda.c @@ -58,6 +58,9 @@ int micromamba(const struct MicromambaInfo *info, char *command, ...) { char rcpath[PATH_MAX]; sprintf(rcpath, "%s/.condarc", info->conda_prefix); touch(rcpath); + if (errno == ENOENT) { + errno = 0; + } setenv("CONDARC", rcpath, 1); setenv("MAMBA_ROOT_PREFIX", info->conda_prefix, 1); -- cgit From 3a00d248ca2a3ab9de44fc60cc6dd042ff512804 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 9 Apr 2026 02:04:02 -0400 Subject: Return immediately if tests struct is NULL --- src/lib/delivery/delivery_test.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/lib/delivery/delivery_test.c b/src/lib/delivery/delivery_test.c index ca40b00..96dbb10 100644 --- a/src/lib/delivery/delivery_test.c +++ b/src/lib/delivery/delivery_test.c @@ -71,6 +71,10 @@ void test_free(struct Test **x) { void tests_free(struct Tests **x) { struct Tests *tests = *x; + if (!tests) { + return; + } + for (size_t i = 0; i < tests->num_alloc; i++) { test_free(&tests->test[i]); } -- cgit