Merge pull request #2708 from kif/2631_segfault_pixelsplitting

2631 segfault pixelsplitting

Author: kif

src/pyFAI/ext/regrid_common.pxi

@@ -32,7 +32,7 @@ Some are defined in the associated header file .pxd
 
 __author__ = "Jérôme Kieffer"
 __contact__ = "Jerome.kieffer@esrf.fr"
-__date__ = "18/11/2025"
+__date__ = "27/11/2025"
 __status__ = "stable"
 __license__ = "MIT"
 
@@ -512,6 +512,7 @@ def _sp_integrate1d(buffer_t[::1] buffer,
                     floating stop0, floating stop1):
     _integrate1d(buffer, start0, start1, stop0, stop1)
 
+
 cdef inline void _integrate2d(buffer_t[:, ::1] box,
                               floating start0, floating start1,
                               floating stop0, floating stop1) noexcept nogil:
@@ -545,7 +546,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                 abs_area = fabs(segment_area)
                 dA = (stop0 - start0)  # always positive
                 h = 0
-                while abs_area > 0:
+                while abs_area > 0 and h<box.shape[1]:
                     if dA > abs_area:
                         dA = abs_area
                         abs_area = -1
@@ -559,7 +560,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                     abs_area = fabs(segment_area)
                     h = 0
                     dA = dP
-                    while abs_area > 0:
+                    while abs_area > 0 and h<box.shape[1]:
                         if dA > abs_area:
                             dA = abs_area
                             abs_area = -1
@@ -573,7 +574,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                     abs_area = fabs(segment_area)
                     h = 0
                     dA = 1.0
-                    while abs_area > 0:
+                    while abs_area > 0 and h<box.shape[1]:
                         if dA > abs_area:
                             dA = abs_area
                             abs_area = -1
@@ -589,7 +590,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                     abs_area = fabs(segment_area)
                     h = 0
                     dA = fabs(dP)
-                    while abs_area > 0:
+                    while abs_area > 0 and h<box.shape[1]:
                         if dA > abs_area:
                             dA = abs_area
                             abs_area = -1
@@ -605,7 +606,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                 # sign = segment_area / abs_area
                 dA = (start0 - stop0)  # always positive
                 h = 0
-                while abs_area > 0:
+                while abs_area > 0 and h<box.shape[1]:
                     if dA > abs_area:
                         dA = abs_area
                         abs_area = -1
@@ -620,7 +621,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                     abs_area = fabs(segment_area)
                     h = 0
                     dA = fabs(dP)
-                    while abs_area > 0:
+                    while abs_area > 0 and h<box.shape[1]:
                         if dA > abs_area:
                             dA = abs_area
                             abs_area = -1
@@ -634,7 +635,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                     abs_area = fabs(segment_area)
                     h = 0
                     dA = 1
-                    while abs_area > 0:
+                    while abs_area > 0 and h<box.shape[1]:
                         if dA > abs_area:
                             dA = abs_area
                             abs_area = -1
@@ -650,7 +651,7 @@ cdef inline void _integrate2d(buffer_t[:, ::1] box,
                     abs_area = fabs(segment_area)
                     h = 0
                     dA = fabs(dP)
-                    while abs_area > 0:
+                    while abs_area > 0 and h<box.shape[1]:
                         if dA > abs_area:
                             dA = abs_area
                             abs_area = -1

src/pyFAI/test/test_azimuthal_integrator.py

@@ -33,7 +33,7 @@
 __contact__ = "Jerome.Kieffer@ESRF.eu"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "21/11/2025"
+__date__ = "27/11/2025"
 
 import unittest
 import os
@@ -806,7 +806,7 @@ def tearDownClass(cls) -> None:
 
     def test_flexible(self):
         for m in IntegrationMethod.select_method(dim=2, impl="cython"):
-            res = self.ai.integrate2d(self.img, 50, 50, method=m, unit=("qx_nm^-1", "qy_nm^-1"))
+            res = self.ai.integrate2d(self.img, 50, 50, method=m, unit=("qxgi_nm^-1", "qygi_nm^-1"))
             img, rad, azim = res
             self.assertTrue(numpy.nanmax(img) > 0, f"image is non empty for {m}")
             radmax = rad.max()