Merge pull request #30040 from vrabaud:function_ptr

Fix function pointer signature mismatches - #30040

Contrib PR: https://github.com/opencv/opencv_contrib/pull/4224

Calling a function through a function pointer with a mismatched signature is undefined behavior in C/C++ and causes Clang Control Flow Integrity to trap with `SIGILL` (`ud1`) at indirect call sites.

This is a follow-up on https://github.com/opencv/opencv/pull/28939

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
Vincent Rabaud
2026-09-23 09:44:20 +02:00
committed by GitHub
parent 924f87f481
commit 747ffc57be
28 changed files with 744 additions and 683 deletions

View File

@@ -49,19 +49,25 @@ void split64s(const int64* src, int64** dst, int len, int cn )
* split & merge *
\****************************************************************************************/
typedef void (*SplitFunc)(const uchar* src, uchar** dst, int len, int cn);
typedef void (*SplitFunc)(const void* src, void** dst, int len, int cn);
template<typename T, void (*fn)(const T*, T**, int, int)>
static void splitWrap(const void* src, void** dst, int len, int cn)
{
fn((const T*)src, (T**)dst, len, cn);
}
static SplitFunc getSplitFunc(int depth)
{
static SplitFunc splitTab[CV_DEPTH_MAX] =
{
(SplitFunc)GET_OPTIMIZED(cv::hal::split8u), (SplitFunc)GET_OPTIMIZED(cv::hal::split8u),
(SplitFunc)GET_OPTIMIZED(cv::hal::split16u), (SplitFunc)GET_OPTIMIZED(cv::hal::split16u),
(SplitFunc)GET_OPTIMIZED(cv::hal::split32s), (SplitFunc)GET_OPTIMIZED(cv::hal::split32s),
(SplitFunc)GET_OPTIMIZED(cv::hal::split64s), (SplitFunc)GET_OPTIMIZED(cv::hal::split16u),
(SplitFunc)GET_OPTIMIZED(cv::hal::split16u), (SplitFunc)GET_OPTIMIZED(cv::hal::split8u),
(SplitFunc)GET_OPTIMIZED(cv::hal::split64s), (SplitFunc)GET_OPTIMIZED(cv::hal::split64s),
(SplitFunc)GET_OPTIMIZED(cv::hal::split32s), 0, 0, 0
splitWrap<uchar, cv::hal::split8u>, splitWrap<uchar, cv::hal::split8u>,
splitWrap<ushort, cv::hal::split16u>, splitWrap<ushort, cv::hal::split16u>,
splitWrap<int, cv::hal::split32s>, splitWrap<int, cv::hal::split32s>,
splitWrap<int64_t, cv::hal::split64s>, splitWrap<ushort, cv::hal::split16u>,
splitWrap<ushort, cv::hal::split16u>, splitWrap<uchar, cv::hal::split8u>,
splitWrap<int64_t, cv::hal::split64s>, splitWrap<int64_t, cv::hal::split64s>,
splitWrap<int, cv::hal::split32s>, 0, 0, 0
};
return splitTab[depth];
@@ -161,7 +167,7 @@ void split(const Mat& src, Mat* mv)
for( size_t j = 0; j < total; j += blocksize )
{
size_t bsz = std::min(total - j, blocksize);
func( ptrs[0], &ptrs[1], (int)bsz, cn );
func( ptrs[0], (void**)&ptrs[1], (int)bsz, cn );
if( j + blocksize < total )
{