Merge branch 'julia'

1 files changed, 12 insertions, 12 deletions

diff --git a/libcrystfel/src/image-seedee.c b/libcrystfel/src/image-seedee.c
index 2a4328ec..1b68aead 100644
--- a/libcrystfel/src/image-seedee.c
+++ b/libcrystfel/src/image-seedee.c
@@ -170,20 +170,20 @@ int image_seedee_read(struct image *image,
 	                                  data_block, data_block_size,
 	                                  &zero_copy, &array);
 	profile_end("seedee-get-size");
-	array.data = malloc(array.size);
-	array.shape = malloc(array.ndims*sizeof(int));
+	array.data = cfmalloc(array.size);
+	array.shape = cfmalloc(array.ndims*sizeof(int));
 	if ( (array.data == NULL) || (array.shape == NULL) ) {
 		cJSON_Delete(json);
-		free(array.data);
-		free(array.shape);
+		cffree(array.data);
+		cffree(array.shape);
 		return 1;
 	}
 
 	if ( array.ndims != 2 ) {
 		ERROR("Seedee data has unexpected number of dimensions "
 		      "(%i, expected 2)\n", array.ndims);
-		free(array.data);
-		free(array.shape);
+		cffree(array.data);
+		cffree(array.shape);
 		return 1;
 	}
 
@@ -195,8 +195,8 @@ int image_seedee_read(struct image *image,
 	cJSON_Delete(json);
 	if ( r < 0 ) {
 		ERROR("Seedee deserialiation failed.\n");
-		free(array.data);
-		free(array.shape);
+		cffree(array.data);
+		cffree(array.shape);
 		return 1;
 	}
 
@@ -208,15 +208,15 @@ int image_seedee_read(struct image *image,
 			ERROR("Failed to load data for panel '%s'\n",
 			      dtempl->panels[i].name);
 			profile_end("seedee-panel");
-			free(array.data);
-			free(array.shape);
+			cffree(array.data);
+			cffree(array.shape);
 			return 1;
 		}
 	}
 	profile_end("seedee-panel");
 
-	free(array.data);
-	free(array.shape);
+	cffree(array.data);
+	cffree(array.shape);
 
 	return 0;
 }