aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2022-12-08 10:47:16 +0100
committerThomas White <taw@physics.org>2022-12-08 10:54:32 +0100
commit76ba21c9f4c7ca7f5981edf7b71073a8e011fe83 (patch)
tree3b98f557ee6cddb3657901b4c7a1bd67411e9fac
parent8f2dc63d0126277726ee233bd46f99500f5e5a2d (diff)
Zaef peak search: set an upper limit on the number of peaks
This avoids an apparently infinite loop with some corner case input.
-rw-r--r--libcrystfel/src/peaks.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index 57d2c92e..837c00fc 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -404,6 +404,12 @@ static void search_peaks_in_panel(struct image *image, float threshold,
image, intensity, NULL);
nacc++;
+ if ( nacc > 10000 ) {
+ ERROR("Too many peaks! Aborting peak seach "
+ "for panel %s\n", p->name);
+ return;
+ }
+
}
}