From 8877eba26cf5b8846e5f0cd9082207bc86ca9a94 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.org.uk>
Date: Sat, 12 Jun 2010 09:58:15 -0700
Subject: calibrate_detector: Fix memory errors

---
 src/calibrate-detector.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/calibrate-detector.c b/src/calibrate-detector.c
index 5341e599..d411c2c6 100644
--- a/src/calibrate-detector.c
+++ b/src/calibrate-detector.c
@@ -324,23 +324,29 @@ int main(int argc, char *argv[])
 		if ( worker_args[i]->filename != NULL ) {
 			free(worker_args[i]->filename);
 		}
-		free(worker_args[i]);
 
 	}
 
-	/* Sum the individual sums */
+	/* Add the individual sums to the 0th sum */
 	for ( i=1; i<nthreads; i++ ) {
+
 		int x, y;
+
 		for ( x=0; x<w; x++ ) {
 		for ( y=0; y<h; y++ ) {
 			float val = worker_args[i]->sum[x+w*y];
 			worker_args[0]->sum[x+w*y] += val;
 		}
 		}
+		free(worker_args[i]->sum);
+		free(worker_args[i]);
+
 	}
 
 	hdf5_write(outfile, worker_args[0]->sum, w, h, H5T_NATIVE_FLOAT);
 
+	free(worker_args[0]->sum);
+	free(worker_args[0]);
 	free(prefix);
 	free(outfile);
 	fclose(fh);
-- 
cgit v1.2.3