Add sanitizers build option, fix a few memory leaks.

Author: BenBrock

CMakeLists.txt

@@ -11,6 +11,8 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_C_FLAGS "-O3 -march=native")
 
+option(ENABLE_SANITIZERS "Enable Clang sanitizers" OFF)
+
 include(GNUInstallDirs)
 
 add_library(binsparse STATIC)
@@ -84,6 +86,12 @@ install(FILES
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/binsparse)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+  if (ENABLE_SANITIZERS)
+      set(SANITIZER_FLAGS "-fsanitize=address,undefined")
+      target_compile_options(binsparse INTERFACE ${SANITIZER_FLAGS} -g -O1 -fno-omit-frame-pointer)
+      target_link_options(binsparse INTERFACE ${SANITIZER_FLAGS})
+  endif()
+
   add_subdirectory(examples)
   add_subdirectory(test)
 endif()

examples/check_equivalence.c

@@ -203,6 +203,11 @@ int main(int argc, char** argv) {
     return 9;
   }
 
+  bsp_destroy_matrix_t(&matrix1);
+  bsp_destroy_matrix_t(&matrix2);
+  bsp_destroy_fdataset_info_t(&info1);
+  bsp_destroy_fdataset_info_t(&info2);
+
   printf("The files are equivalent.\n");
   printf("OK!\n");
 

examples/mtx2bsp.c

@@ -171,6 +171,9 @@ int main(int argc, char** argv) {
   printf(" === Done writing. ===\n");
 
   bsp_destroy_matrix_t(&matrix);
+  bsp_destroy_mm_metadata(&m);
+  bsp_destroy_fdataset_info_t(&info2);
+  cJSON_Delete(user_json);
 
   return 0;
 }

include/binsparse/detail/parse_dataset.h

@@ -13,6 +13,11 @@ typedef struct {
   char* dataset;
 } bsp_fdataset_info_t;
 
+static inline void bsp_destroy_fdataset_info_t(bsp_fdataset_info_t* info) {
+  free(info->fname);
+  free(info->dataset);
+}
+
 static inline bsp_fdataset_info_t bsp_parse_fdataset_string(char* str) {
   size_t len = strlen(str);
 

include/binsparse/matrix_market/matrix_market_inspector.h

@@ -32,6 +32,10 @@ typedef struct bsp_mm_metadata {
   char* comments;
 } bsp_mm_metadata;
 
+static inline void bsp_destroy_mm_metadata(bsp_mm_metadata* metadata) {
+  free(metadata->comments);
+}
+
 static inline bsp_mm_metadata bsp_mmread_metadata(const char* file_path) {
   FILE* f = fopen(file_path, "r");
 

include/binsparse/matrix_market/matrix_market_read.h

@@ -109,6 +109,8 @@ static inline bsp_matrix_t bsp_mmread_explicit_array(const char* file_path,
 
   fclose(f);
 
+  bsp_destroy_mm_metadata(&metadata);
+
   return matrix;
 }
 
@@ -306,6 +308,8 @@ bsp_mmread_explicit_coordinate(const char* file_path, bsp_type_t value_type,
   free(indices);
   fclose(f);
 
+  bsp_destroy_mm_metadata(&metadata);
+
   return matrix;
 }
 
@@ -315,8 +319,10 @@ static inline bsp_matrix_t bsp_mmread_explicit(const char* file_path,
   bsp_mm_metadata metadata = bsp_mmread_metadata(file_path);
 
   if (strcmp(metadata.format, "array") == 0) {
+    bsp_destroy_mm_metadata(&metadata);
     return bsp_mmread_explicit_array(file_path, value_type, index_type);
   } else if (strcmp(metadata.format, "coordinate") == 0) {
+    bsp_destroy_mm_metadata(&metadata);
     return bsp_mmread_explicit_coordinate(file_path, value_type, index_type);
   } else {
     assert(false);
@@ -345,5 +351,7 @@ static inline bsp_matrix_t bsp_mmread(const char* file_path) {
 
   bsp_type_t index_type = bsp_pick_integer_type(max_dim);
 
+  bsp_destroy_mm_metadata(&metadata);
+
   return bsp_mmread_explicit(file_path, value_type, index_type);
 }

src/write_matrix.c

@@ -22,7 +22,8 @@ char* bsp_generate_json(bsp_matrix_t matrix, cJSON* user_json) {
 
   cJSON* item;
   cJSON_ArrayForEach(item, user_json) {
-    cJSON_AddItemToObject(j, item->string, item);
+    cJSON* item_copy = cJSON_Duplicate(item, 1); // 1 = deep copy
+    cJSON_AddItemToObject(j, item->string, item_copy);
   }
 
   cJSON_AddStringToObject(binsparse, "version", BINSPARSE_VERSION);