From 9677bc525b41a133ca611b60a383dab58b0ea5f9 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Wed, 26 Jul 2023 16:23:17 +0200
Subject: Initialise det->top_group

---
 libcrystfel/src/datatemplate.c | 2 ++
 libcrystfel/src/detgeom.c      | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'libcrystfel/src')

diff --git a/libcrystfel/src/datatemplate.c b/libcrystfel/src/datatemplate.c
index 12d4d85f..26d0bd06 100644
--- a/libcrystfel/src/datatemplate.c
+++ b/libcrystfel/src/datatemplate.c
@@ -1912,6 +1912,8 @@ struct detgeom *create_detgeom(struct image *image,
 	detgeom = malloc(sizeof(struct detgeom));
 	if ( detgeom == NULL ) return NULL;
 
+	detgeom->top_group = NULL;
+
 	detgeom->panels = malloc(dtempl->n_panels*sizeof(struct detgeom_panel));
 	if ( detgeom->panels == NULL ) {
 		free(detgeom);
diff --git a/libcrystfel/src/detgeom.c b/libcrystfel/src/detgeom.c
index 3516d996..b4835317 100644
--- a/libcrystfel/src/detgeom.c
+++ b/libcrystfel/src/detgeom.c
@@ -68,6 +68,8 @@ static void free_group(struct detgeom_panel_group *g)
 {
 	int i;
 
+	if ( g == NULL ) return;
+
 	for ( i=0; i<g->n_children; i++ ) {
 		free_group(g->children[i]);
 	}
-- 
cgit v1.2.3