Fix memory allocation routines

libcrystfel/src/cell-utils.c

@@ -2505,6 +2505,12 @@ SymOpList *get_lattice_symmetry(UnitCell *cell)
 }
 
 
+void free_powder_rings(struct powder_ring *r)
+{
+	cffree(r);
+}
+
+
 static int cmpres(const void *av, const void *bv)
 {
 	const struct powder_ring *a = av;
@@ -2565,7 +2571,7 @@ struct powder_ring *powder_rings(UnitCell *cell, SymOpList *sym, double mres,
 	}
 
 	n = num_reflections(list);
-	sortus = malloc(n*sizeof(struct powder_ring));
+	sortus = cfmalloc(n*sizeof(struct powder_ring));
 
 	i = 0;
 	for ( ring = first_refl(list, &iter);

libcrystfel/src/cell-utils.h

@@ -118,6 +118,8 @@ extern struct powder_ring *powder_rings(UnitCell *cell,
                                         double mres,
                                         int *n_rings);
 
+extern void free_powder_rings(struct powder_ring *r);
+
 #ifdef __cplusplus
 }
 #endif

libcrystfel/src/datatemplate.c

@@ -847,8 +847,8 @@ static void store_for_later(struct forlater *fl, const char *key, const char *va
 		return;
 	}
 
-	fl->keys[fl->n_forlater] = strdup(key);
-	fl->vals[fl->n_forlater] = strdup(val);
+	fl->keys[fl->n_forlater] = cfstrdup(key);
+	fl->vals[fl->n_forlater] = cfstrdup(val);
 	fl->n_forlater++;
 }
 
@@ -1462,7 +1462,7 @@ DataTemplate *data_template_new_from_string(const char *string_in)
 	/* If no groups are defined, put everything in one group.
 	 * This allows at least basic geometry refinement to work. */
 	if ( dt->n_groups == dt->n_panels ) {
-		char **allg = malloc(dt->n_groups*sizeof(char *));
+		char **allg = cfmalloc(dt->n_groups*sizeof(char *));
 		if ( allg == NULL ) {
 			ERROR("Failed to create top group\n");
 		} else {
@@ -1471,7 +1471,7 @@ DataTemplate *data_template_new_from_string(const char *string_in)
 				allg[i] = dt->groups[i]->name;
 			}
 			add_group_members("all", dt, allg, dt->n_groups);
-			free(allg);
+			cffree(allg);
 		}
 	}
 

src/cell_tool.c

@@ -183,7 +183,7 @@ static int all_rings(UnitCell *cell, SymOpList *sym, double mres)
 		       rings[i].multi);
 	}
 
-	free(rings);
+	free_powder_rings(rings);
 
 	return 0;
 }