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/lib/delivery/delivery_test.c') 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 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/lib/delivery/delivery_test.c') 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_test.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/lib/delivery/delivery_test.c') 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 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/lib/delivery/delivery_test.c') 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