Skip to content

O
opencv
Commit 48a5599c authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fixed potentially incorrect memory access in cv::transform

parent 98e13cec
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
modules/core/src/matmul.cpp
View file @ 48a5599c
...@@ -1743,12 +1743,13 @@ void cv::transform( InputArray _src, OutputArray _dst, InputArray _mtx ) ...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment