Merge pull request #2544 from cta-observatory/fix_flashcam_extractor

Fix possible out of bounds error in FlashCamExtractor
cta-observatory · Apr 25, 2024 · 8b6df5c · 8b6df5c
2 parents d3121f7 + dba9d7d
commit 8b6df5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/changes/2544.bugfix.rst b/docs/changes/2544.bugfix.rst
@@ -0,0 +1 @@
+Fix a possible out-of-bounds array access in the FlashCamExtractor.
diff --git a/src/ctapipe/image/extractor.py b/src/ctapipe/image/extractor.py
@@ -1531,15 +1531,15 @@ def adaptive_centroid(waveforms, peak_index, rel_descend_limit, centroids):
         sum_ += waveforms[j]
         jsum += j * waveforms[j]
         j -= 1
-        if waveforms[j] > peak_amplitude:
+        if j >= 0 and waveforms[j] > peak_amplitude:
             descend_limit = rel_descend_limit * peak_amplitude
 
     j = peak_index + 1
     while j < n_samples and waveforms[j] > descend_limit:
         sum_ += waveforms[j]
         jsum += j * waveforms[j]
         j += 1
-        if waveforms[j] > peak_amplitude:
+        if j < n_samples and waveforms[j] > peak_amplitude:
             descend_limit = rel_descend_limit * peak_amplitude
 
     if sum_ != 0.0: