mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed memory corruption when normal dist. params have less channels than target matrix; test added

Browse Source
This commit is contained in:
Rostislav Vasilikhin 2016-07-16 14:26:31 +03:00
parent 5e4d3559be
commit 7b2ef647aa
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/core/src/rand.cpp
View File

@ -622,7 +622,7 @@ void RNG::fill( InputOutputArray _mat, int disttype,
int ptype = depth == CV_64F ? CV_64F : CV_32F;
int esz = (int)CV_ELEM_SIZE(ptype);
if( _param1.isContinuous() && _param1.type() == ptype )
if( _param1.isContinuous() && _param1.type() == ptype && n1 >= cn)
mean = _param1.data;
else
{
@ -635,18 +635,18 @@ void RNG::fill( InputOutputArray _mat, int disttype,
for( j = n1*esz; j < cn*esz; j++ )
mean[j] = mean[j - n1*esz];
if( _param2.isContinuous() && _param2.type() == ptype )
if( _param2.isContinuous() && _param2.type() == ptype && n2 >= cn)
stddev = _param2.data;
else
{
Mat tmp(_param2.size(), ptype, parambuf + cn);
Mat tmp(_param2.size(), ptype, parambuf + MAX(n1, cn));
_param2.convertTo(tmp, ptype);
stddev = (uchar*)(parambuf + cn);
stddev = (uchar*)(parambuf + MAX(n1, cn));
}
if( n1 < cn )
for( j = n1*esz; j < cn*esz; j++ )
stddev[j] = stddev[j - n1*esz];
if( n2 < cn )
for( j = n2*esz; j < cn*esz; j++ )
stddev[j] = stddev[j - n2*esz];
stdmtx = _param2.rows == cn && _param2.cols == cn;
scaleFunc = randnScaleTab[depth];

17
modules/core/test/test_rand.cpp
View File

@ -365,3 +365,20 @@ TEST(Core_RNG_MT19937, regression)
ASSERT_EQ(expected[i], actual[i]);
}
}
TEST(Core_Rand, Regression_Stack_Corruption)
{
int bufsz = 128; //enough for 14 doubles
AutoBuffer<uchar> buffer(bufsz);
size_t offset = 0;
cv::Mat_<cv::Point2d> x(2, 3, (cv::Point2d*)(buffer+offset)); offset += x.total()*x.elemSize();
double& param1 = *(double*)(buffer+offset); offset += sizeof(double);
double& param2 = *(double*)(buffer+offset); offset += sizeof(double);
param1 = -9; param2 = 2;
cv::theRNG().fill(x, cv::RNG::NORMAL, param1, param2);
ASSERT_EQ(param1, -9);
ASSERT_EQ(param2, 2);
}