potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #28581 from JoyBoy900908:fix-ubsan-countnonzero

Browse Source 
core: fix UBSan function pointer type mismatch in countNonZero
This commit is contained in:
Alexander Smorkalov
2026-03-12 10:16:17 +03:00
committed by GitHub
parent 4391bd4cb4 7286212ce6
commit 1a3e1e05b7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/count_non_zero.simd.hpp
+11 -6
View File
@@ -6,7 +6,7 @@
namespace cv {
typedef int (*CountNonZeroFunc)(const uchar*, int);
typedef int (*CountNonZeroFunc)(const void*, int);
CV_CPU_OPTIMIZATION_NAMESPACE_BEGIN
@@ -29,8 +29,9 @@ static int countNonZero_(const T* src, int len )
return nz;
}
static int countNonZero8u( const uchar* src, int len )
static int countNonZero8u( const void* src_ptr, int len )
{
const uchar* src = static_cast<const uchar*>(src_ptr);
int i=0, nz = 0;
#if (CV_SIMD || CV_SIMD_SCALABLE)
int len0 = len & -VTraits<v_uint8>::vlanes();
@@ -66,8 +67,9 @@ static int countNonZero8u( const uchar* src, int len )
return nz;
}
static int countNonZero16u( const ushort* src, int len )
static int countNonZero16u( const void* src_ptr, int len )
{
const ushort* src = static_cast<const ushort*>(src_ptr);
int i = 0, nz = 0;
#if (CV_SIMD || CV_SIMD_SCALABLE)
int len0 = len & -VTraits<v_int8>::vlanes();
@@ -101,8 +103,9 @@ static int countNonZero16u( const ushort* src, int len )
return nz + countNonZero_(src + i, len - i);
}
static int countNonZero32s( const int* src, int len )
static int countNonZero32s( const void* src_ptr, int len )
{
const int* src = static_cast<const int*>(src_ptr);
int i = 0, nz = 0;
#if (CV_SIMD || CV_SIMD_SCALABLE)
int len0 = len & -VTraits<v_int8>::vlanes();
@@ -136,8 +139,9 @@ static int countNonZero32s( const int* src, int len )
return nz + countNonZero_(src + i, len - i);
}
static int countNonZero32f( const float* src, int len )
static int countNonZero32f( const void* src_ptr, int len )
{
const float* src = static_cast<const float*>(src_ptr);
int i = 0, nz = 0;
#if (CV_SIMD || CV_SIMD_SCALABLE)
int len0 = len & -VTraits<v_int8>::vlanes();
@@ -171,8 +175,9 @@ static int countNonZero32f( const float* src, int len )
return nz + countNonZero_(src + i, len - i);
}
static int countNonZero64f( const double* src, int len )
static int countNonZero64f( const void* src_ptr, int len )
{
const double* src = static_cast<const double*>(src_ptr);
int nz = 0, i = 0;
#if (CV_SIMD_64F || CV_SIMD_SCALABLE_64F)
v_int64 sum1 = vx_setzero_s64();