third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21779 from eplankin:fix_11303

Browse Source 
Fixed out-of-bounds read in parallel version of ippGaussianBlur()

* Fixed out-of-memory read in parallel version of ippGaussianBlur()

* Fixed check

* Revert changes in CMakeLists.txt
This commit is contained in:
eplankin 2022-04-05 18:58:15 +03:00 committed by GitHub
parent 84b4a5a495
commit d793ec2ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgproc/src/smooth.dispatch.cpp
View File

@ -566,7 +566,7 @@ static bool ipp_GaussianBlur(InputArray _src, OutputArray _dst, Size ksize,
if (IPP_DISABLE_GAUSSIAN_BLUR_32FC4_1TH && (threads == 1 && src.type() == CV_32FC4))
return false;
if(IPP_GAUSSIANBLUR_PARALLEL && threads > 1) {
if(IPP_GAUSSIANBLUR_PARALLEL && threads > 1 && iwSrc.m_size.height/(threads * 4) >= ksize.height/2) {
bool ok;
ipp_gaussianBlurParallel invoker(iwSrc, iwDst, ksize.width, (float) sigma1, ippBorder, &ok);

11
modules/imgproc/test/test_filter.cpp
View File

@ -2355,5 +2355,16 @@ TEST(Imgproc, filter_empty_src_16857)
EXPECT_TRUE(dst2.empty());
}
TEST(Imgproc_GaussianBlur, regression_11303)
{
cv::Mat dst;
int width = 2115;
int height = 211;
double sigma = 8.64421;
cv::Mat src(cv::Size(width, height), CV_32F, 1);
cv::GaussianBlur(src, dst, cv::Size(), sigma, sigma);
EXPECT_LE(cv::norm(src, dst, NORM_L2), 1e-3);
}
}} // namespace