Merge pull request #23567 from seanm:UBSan-overflow

Reformulated some pointer arithmetic to avoid (unsigned) overflow
2 years ago · 02397ef851
parent f1076541d1 2083fdc9c0
commit 02397ef851
1 changed files with 3 additions and 1 deletions
--- a/modules/imgproc/src/filter.simd.hpp
+++ b/modules/imgproc/src/filter.simd.hpp
@ -44,6 +44,8 @@
 #include "opencv2/core/hal/intrin.hpp"
 #include "filter.hpp"

+#include <cstddef>
+
 #if defined(CV_CPU_BASELINE_MODE)
 #if IPP_VERSION_X100 >= 710
 #define USE_IPP_SEP_FILTERS 1
@ -304,7 +306,7 @@ void FilterEngine__apply(FilterEngine& this_, const Mat& src, Mat& dst, const Si
    FilterEngine__start(this_, wsz, src.size(), ofs);
    int y = this_.startY - ofs.y;
    FilterEngine__proceed(this_,
-            src.ptr() + y*src.step,
+            src.ptr() + y * (ptrdiff_t)src.step,
            (int)src.step,
            this_.endY - this_.startY,
            dst.ptr(),