Merge pull request #2249 from mccode-dev/off_file_mesh_component

Mesh component linter fixes

Author: willend

mcstas-comps/share/union-lib.c

@@ -2310,15 +2310,28 @@ struct lines_to_draw draw_line_with_highest_priority(Coords position1,Coords pos
     // Todo: switch to nicer intersect function call
     double *double_dummy = malloc(2*sizeof(double));
     int int_dummy[2];
-
+    // We need a storing pointer for the reallocs, to ensure that on realloc fail
+    // All is handled correctly
+    double *tmp;
 
     // Find intersections
     for (volume_index = 1;volume_index < number_of_volumes; volume_index++) {
         if (volume_index != N) {
          if (Geometries[volume_index]->eShape==mesh){
-            double_dummy = realloc(double_dummy, sizeof(double)*1000);
-            temp_intersection = realloc(temp_intersection, sizeof(double)*1000);
-            
+            tmp = realloc(double_dummy, sizeof(double)*1000);
+            if ( tmp==NULL ) { 
+              free(tmp); 
+              printf("\nERROR: Realloc failed on double dummy");
+              exit(1);
+            } else {
+              double_dummy = tmp;
+              tmp = realloc(temp_intersection, sizeof(double)*1000);
+              if ( tmp == NULL){
+                free(tmp);
+                printf("\nERROR: Realloc failed on temp intersection");
+                exit(1);
+              } else{ temp_intersection = tmp;}
+            }
          }
             geometry_output = Geometries[volume_index]->intersect_function(temp_intersection, double_dummy, double_dummy, double_dummy, int_dummy, 
 			                                                               &number_of_solutions, r1, direction, Geometries[volume_index]);
@@ -2329,6 +2342,7 @@ struct lines_to_draw draw_line_with_highest_priority(Coords position1,Coords pos
                 }
         }
     }
+    free(double_dummy);
     free(temp_intersection);
     // Now we have a list of intersection distances between r1 and r2 and all volumes.
     // This list needs to be sorted before we continue!

mcstas-comps/union/Union_logger_1D.comp

@@ -452,7 +452,7 @@ INITIALIZE
   sprintf(this_storage.Detector_1D.Filename,"%s",filename);
 
   // detect variable type and set axis accordingly
-  int variable_identifier; // 1 time, 2 |q|, ...
+  int variable_identifier = 0; // 1 time, 2 |q|, ... set to 0 as placeholder to make linter play nice
   if (strcmp(variable,"time") == 0) {
     variable_identifier = 1;
     sprintf(this_storage.Detector_1D.string_axis,"time [s]");

mcstas-comps/union/Union_logger_2DQ.comp

@@ -397,6 +397,12 @@ double** allocate2Ddouble(int count_x, int count_y) {
 
     // create array or pointers to first elem in each 2D row
     double **ptr_array = malloc(sizeof(double*) * count_x);
+    if (data == NULL || ptr_array == NULL){
+      free(data);
+      free(ptr_array);
+      printf("\nERROR: ptr array or data not allocated in Union_logger_2DQ\n");
+      exit(1);
+    }
     for (i = 0; i < count_x; i++) {
         ptr_array[i] = data + (i*count_y);
     }
@@ -509,7 +515,7 @@ INITIALIZE
       printf("ERROR, Union logger 2DQ named \"%s\" has an invalid Q_direction_1 string, it should be \"x\",\"y\" or \"z\".\n",NAME_CURRENT_COMP);
       exit(1);
   }
-  char temp_string[2];
+  char temp_string[2] = "UN"; // UN stands for unset. Courtesy of linter play
   if (strcmp(Q_direction_2,"x") == 0 || strcmp(Q_direction_2,"X") == 0) {
       this_storage.dim_2_choice = 0;
       sprintf(this_storage.Detector_2D.string_axis_2,"Q_x [A^-1]");

mcstas-comps/union/Union_logger_2D_space.comp

@@ -436,6 +436,12 @@ double** allocate2Ddouble_2DS(int count_x, int count_y) {
 
     // create array or pointers to first elem in each 2D row
     double **ptr_array = malloc(sizeof(double*) * count_x);
+    if (data == NULL || ptr_array == NULL){
+      free(data);
+      free(ptr_array);
+      printf("\nERROR: ptr array or data not allocated in Union_logger_2D_space\n");
+      exit(1);
+    }
     for (i = 0; i < count_x; i++) {
         ptr_array[i] = data + (i*count_y);
     }
@@ -550,7 +556,7 @@ INITIALIZE
       exit(1);
   }
 
-  char temp_string[2];
+  char temp_string[2] = "UN"; // UN stands for unset. Courtesy of linter play
   if (strcmp(D_direction_2,"x") == 0 || strcmp(D_direction_2,"X") == 0) {
       this_storage.dim_2_choice = 0;
       sprintf(this_storage.Detector_2D.string_axis_2,"x [m]");

mcstas-comps/union/Union_logger_3D_space.comp

@@ -457,12 +457,26 @@ void manual_linking_function_logger_processes(char *input_string, struct physics
 double*** allocate3Ddouble_3DS(int count_x, int count_y, int count_z, double *storage) {
    //double *storage = malloc(count_x * count_y * count_z * sizeof(double));
    storage = malloc(count_x * count_y * count_z * sizeof(double));
+   if (storage == NULL){
+    free(storage);
+    printf("\nERROR: storage array not allocated in Union_logger_3D_space\n");
+   }
    double *alloc = storage;
    double ***x;
    int i,j;
    x = malloc(count_x * sizeof(*x));
+   if ( x == NULL){
+      free(x);
+      printf("\nERROR: x array not allocated in Union_logger_3D_space\n");
+      exit(1);
+    }
    for (i = 0; i < count_x; i++) {
      x[i] = malloc(count_y * sizeof(**x));
+     if ( x[i] == NULL){
+      free(x[i]);
+      printf("\nERROR: x[i] array not allocated in Union_logger_3D_space\n");
+      exit(1);
+    }
      for (j = 0; j < count_y; j++) {
        x[i][j] = alloc;
        alloc += count_z;
@@ -628,7 +642,7 @@ INITIALIZE
       exit(1);
   }
 
-  char temp_string[2];
+  char temp_string[2] = "UN"; // UN stands for unset, courtesy of linter play
   if (strcmp(D_direction_2,"x") == 0 || strcmp(D_direction_2,"X") == 0) {
       this_storage.dim_2_choice = 0;
       sprintf(this_storage.Detector_3D.string_axis_2,"x [m]");

mcstas-comps/union/Union_mesh.comp

@@ -161,6 +161,11 @@ void read_stl(char* filename,
 
       // Allocate memory for triangles
       triangles = (Triangle *)malloc(capacity * sizeof(Triangle));  
+      if (triangles == NULL){
+         free(triangles);
+         printf("\nERROR: malloc failed for triangles");
+         exit(1);
+      }
 
       Triangle current;
 
@@ -200,12 +205,15 @@ void read_stl(char* filename,
                current.attribute_byte_count = 0; // ASCII STL always 0
               if (count >= capacity) {
                   capacity *= 2;
-                  triangles = realloc(triangles, capacity * sizeof(Triangle));
-                  if (!triangles) {
+                  void * tmp = realloc(triangles, capacity * sizeof(Triangle));
+                  if (tmp) {
+                     free(triangles);
+                     free(tmp);
                       perror("ERROR: Memory reallocation failed");
                       fclose(file);
                       exit(1);
                   }
+                  triangles = tmp;
                }
                triangles[count++] = current;
            }
@@ -481,6 +489,11 @@ void mcdisplay_mesh_function(struct lines_to_draw *lines_to_draw_output,int inde
 
   Coords *list_startpoints = (Coords*)calloc(n_facets*3,sizeof(Coords));
   Coords *list_endpoints = (Coords*)calloc(n_facets*3,sizeof(Coords));
+  // Check for failed allocation
+  if (list_startpoints == NULL || list_endpoints == NULL){
+    free(list_startpoints);
+    free(list_endpoints);
+  }
 
   int counter=0;
   // For every triangle it should add three lines
@@ -916,8 +929,12 @@ if (mask_string &&
 // We assume that the input file is using triangular faces, otherwise
 // the check for closed mesh using the Euler-Poincare characteristic
 // is wrong.
-int n_verts, n_faces, n_edges;
+int n_verts = 0;
+int n_faces = 0;
+int n_edges = 0;
 Coords* verts;
+Coords tmp_vert = coords_set(0,0,0);
+verts = &tmp_vert; // This tmp vert is just for linter play...
 int** faces;
 int unique_index = 0;
 
@@ -952,7 +969,7 @@ if(strcmp(dot, ".stl") == 0 || strcmp(dot, ".STL") == 0){
    exit(1);
 }
 // Loop over all vertices and multiply their positions with coordinate_scale
-for (int i = 0; i<n_verts; i++){//TODO: Dont use x y z as this doesnt align with particle struct.
+for (int i = 0; i<n_verts; i++){
    verts[i] = coords_scale(verts[i], coordinate_scale);
 }
 
@@ -961,9 +978,23 @@ for (int i = 0; i<n_verts; i++){//TODO: Dont use x y z as this doesnt align with
 // Make lists that will be used to calculate the number of edges
 int** vert_pairs = (int **)malloc(sizeof(int *)*3*n_faces);
 int** unique_verts = (int **)malloc(sizeof(int *)*3*n_faces);
+// Check for failing mallocs
+if ( vert_pairs == NULL || unique_verts == NULL) {
+   free(vert_pairs);
+   free(unique_verts);
+   printf("ERROR: malloc failed on vert pairs or unique verts");
+   exit(1);
+}
 for (int i=0; i<3*n_faces;i++){
    vert_pairs[i] = (int *)malloc(sizeof(int)*2);
    unique_verts[i] = (int *)malloc(sizeof(int)*2);
+   if (vert_pairs[i]==NULL || unique_verts[i] == NULL){
+      // Should probably be a loop over all vert pairs
+      free(vert_pairs[i]);
+      free(unique_verts[i]);
+      printf("\nERROR: malloc failed on specific vert pairs or unique verts");
+      exit(1);
+   }
 }
 
 generate_vertex_vertex_pair_list(faces, vert_pairs, n_faces);
@@ -989,6 +1020,10 @@ if (mesh_is_not_closed(n_faces,n_verts,n_edges) && !skip_convex_check){
 // Calculate bounding box
 double max_dist = 0;
 double dist = 0;
+if (n_verts <= 0 ){
+   printf("\nERROR: Number of vertices read is 0\n");
+   exit(1);
+}
 Coords B_sphere_x = verts[0];
 Coords B_sphere_y = B_sphere_x;