fix: fixed problems with init and destroy slice

This commit is contained in:
2026-04-21 09:10:53 -06:00
parent 6088895ad0
commit dafaa5b87e
2 changed files with 29 additions and 0 deletions

View File

@@ -46,6 +46,7 @@ ArrayList *arraylist_init(size_t capacity, size_t elem_size) {
arr->capacity = capacity; arr->capacity = capacity;
arr->elem_size = elem_size; arr->elem_size = elem_size;
arr->len = 0; arr->len = 0;
arr->borrows = 0;
arr->buffer = malloc(capacity * elem_size); arr->buffer = malloc(capacity * elem_size);
if (arr->buffer == NULL) { if (arr->buffer == NULL) {
free(arr); free(arr);
@@ -496,6 +497,10 @@ ArrayListErr arrayslice_destroy(ArraySlice **slice) {
return ARRLIST_NULL_ARG; return ARRLIST_NULL_ARG;
} }
if ((*slice)->is_safe) {
(*slice)->arr->borrows--;
}
free(*slice); free(*slice);
*slice = NULL; *slice = NULL;

View File

@@ -1014,6 +1014,24 @@ static void test_reserve_size_0(void **state) {
arraylist_destroy(&arr); arraylist_destroy(&arr);
} }
// Slice creation
static void test_slice_valid_init(void **state) {
(void) state;
ArrayList *arr = arraylist_init(64, sizeof(int));
assert_non_null(arr);
for (size_t i = 0; i < 10; i++) {
assert_uint_equal(arraylist_push_back(arr, &i), ARRLIST_OK);
}
ArraySlice *slice = arraylist_slice(arr, 0, 10);
assert_non_null(slice);
arrayslice_destroy(&slice);
arraylist_destroy(&arr);
}
int main(void) { int main(void) {
const struct CMUnitTest init[] = { const struct CMUnitTest init[] = {
cmocka_unit_test(test_init_valid_parameters), cmocka_unit_test(test_init_valid_parameters),
@@ -1125,6 +1143,10 @@ int main(void) {
cmocka_unit_test(test_reserve_size_max), cmocka_unit_test(test_reserve_size_max),
}; };
const struct CMUnitTest slice_init[] = {
cmocka_unit_test(test_slice_valid_init),
};
int rc = 0; int rc = 0;
rc += cmocka_run_group_tests(init, NULL, NULL); rc += cmocka_run_group_tests(init, NULL, NULL);
@@ -1142,5 +1164,7 @@ int main(void) {
rc += cmocka_run_group_tests(resize, NULL, NULL); rc += cmocka_run_group_tests(resize, NULL, NULL);
rc += cmocka_run_group_tests(reserve, NULL, NULL); rc += cmocka_run_group_tests(reserve, NULL, NULL);
rc += cmocka_run_group_tests(slice_init, NULL, NULL);
return rc; return rc;
} }