Tidy up some small leaks and memory bugs

2 files changed, 4 insertions, 2 deletions

diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index bef1bf56..36150a1b 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -521,8 +521,6 @@ static void run_work(const struct index_args *iargs,
 	free(bd.rbuffer);
 
 	cleanup_indexing(iargs->indm, iargs->ipriv);
-	free(iargs->indm);
-	free(iargs->ipriv);
 	free_detector_geometry(iargs->det);
 	free(iargs->hdf5_peak_path);
 	free_copy_hdf5_field_list(iargs->copyme);
diff --git a/src/indexamajig.c b/src/indexamajig.c
index c7e4a270..deac67bf 100644
--- a/src/indexamajig.c
+++ b/src/indexamajig.c
@@ -724,9 +724,13 @@ int main(int argc, char *argv[])
 	create_sandbox(&iargs, n_proc, prefix, config_basename, fh,
 	               st, tempdir);
 
+	free_copy_hdf5_field_list(iargs.copyme);
+	cell_free(iargs.cell);
+	free(iargs.beam->photon_energy_from);
 	free(prefix);
 	free(tempdir);
 	free_detector_geometry(iargs.det);
+	free(iargs.hdf5_peak_path);
 	close_stream(st);
 	cleanup_indexing(indm, ipriv);