generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed potentially incorrect memory access in cv::transform

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-06-17 16:14:47 +00:00
parent 98e13cec87
commit 48a5599c5e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/matmul.cpp
View File

@ -1743,12 +1743,13 @@ void cv::transform( InputArray _src, OutputArray _dst, InputArray _mtx )
int mtype = depth == CV_32S || depth == CV_64F ? CV_64F : CV_32F; int mtype = depth == CV_32S || depth == CV_64F ? CV_64F : CV_32F;
AutoBuffer<double> _mbuf; AutoBuffer<double> _mbuf;
double* mbuf = _mbuf; double* mbuf;
if( !m.isContinuous() || m.type() != mtype || m.cols != scn + 1 ) if( !m.isContinuous() || m.type() != mtype || m.cols != scn + 1 )
{ {
_mbuf.allocate(dcn*(scn+1)); _mbuf.allocate(dcn*(scn+1));
Mat tmp(dcn, scn+1, mtype, (double*)_mbuf); mbuf = (double*)_mbuf;
Mat tmp(dcn, scn+1, mtype, mbuf);
memset(tmp.data, 0, tmp.total()*tmp.elemSize()); memset(tmp.data, 0, tmp.total()*tmp.elemSize());
if( m.cols == scn+1 ) if( m.cols == scn+1 )
m.convertTo(tmp, mtype); m.convertTo(tmp, mtype);