Fix element destructor

eteran · Oct 29, 2023 · cf622b8 · cf622b8
1 parent 61ccddf
commit cf622b8
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/cvector.h b/cvector.h
@@ -179,7 +179,9 @@ typedef struct cvector_metadata_t {
             if (elem_destructor__) {                                                    \
                 size_t i__;                                                             \
                 for (i__ = 0; i__ < cvector_size(vec); ++i__) {                         \
-                    elem_destructor__(&(vec)[i__]);                                     \
+                    void *p__;                                                          \
+                    memcpy(&p__, &(vec)[i__], sizeof(void*));                           \
+                    elem_destructor__(p__);                                             \
                 }                                                                       \
             }                                                                           \
             cvector_clib_free(p1__);                                                    \

diff --git a/test.c b/test.c
@@ -13,11 +13,13 @@
 #include "cvector_utils.h"
 
 int main() {
-    cvector_vector_type(int) v           = NULL;
-    cvector_vector_type(int) a           = NULL;
-    cvector_vector_type(int) b           = NULL;
-    cvector_vector_type(int) c           = NULL;
-    cvector_vector_type(char *) str_vect = NULL;
+    cvector_vector_type(int) v            = NULL;
+    cvector_vector_type(int) a            = NULL;
+    cvector_vector_type(int) b            = NULL;
+    cvector_vector_type(int) c            = NULL;
+    cvector_vector_type(char *) str_vect  = NULL;
+    cvector_vector_type(char *) str_vect1 = NULL;
+    cvector_vector_type(char *) str_vect2 = NULL;
 
     /* add some elements to the back */
     cvector_push_back(v, 10);
@@ -145,6 +147,9 @@ int main() {
     printf("c size        : %zu\n", cvector_size(c));
     cvector_free(c);
 
+    /* str_vect
+     * manually free each element
+     */
     cvector_push_back(str_vect, strdup("Hello world"));
     cvector_push_back(str_vect, strdup("Good  bye world"));
     cvector_push_back(str_vect, strdup("not today"));
@@ -155,7 +160,38 @@ int main() {
             printf("v[%zu] = %s\n", i, str_vect[i]);
         }
     }
-
     cvector_free_each_and_free(str_vect, free);
+
+    /* str_vect1
+     * auto free each element by freeing the vector itself
+     */
+    cvector_init(str_vect1, 1, free);
+    cvector_push_back(str_vect1, strdup("1: Hello world"));
+    cvector_push_back(str_vect1, strdup("1: Good  bye world"));
+    cvector_push_back(str_vect1, strdup("1: not today"));
+
+    if (str_vect1) {
+        size_t i;
+        for (i = 0; i < cvector_size(str_vect1); ++i) {
+            printf("v[%zu] = %s\n", i, str_vect1[i]);
+        }
+    }
+    cvector_free(str_vect1);
+
+    /* str_vect2
+     * elements are out of scope, do not free them
+     */
+    cvector_push_back(str_vect2, "2: Hello world");
+    cvector_push_back(str_vect2, "2: Good  bye world");
+    cvector_push_back(str_vect2, "2: not today");
+
+    if (str_vect2) {
+        size_t i;
+        for (i = 0; i < cvector_size(str_vect2); ++i) {
+            printf("v[%zu] = %s\n", i, str_vect2[i]);
+        }
+    }
+    cvector_free(str_vect2);
+
     return 0;
 }
diff --git a/unit-tests.c b/unit-tests.c
@@ -238,7 +238,7 @@ UTEST(test, test_complex_insert) {
 }
 
 void cvector_free_destructor(void *p) {
-    free(*(void **)p);
+    free(p);
 }
 
 UTEST(test, derefence_destructor) {