Skip to content

O
opencv
Commit 2547f755 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

fixed memory corruption in CvEM::read() (ticket #1399)

parent b20871ce
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
modules/ml/src/em.cpp
View file @ 2547f755
...@@ -137,7 +137,6 @@ void CvEM::read( CvFileStorage* fs, CvFileNode* node ) ...@@ -137,7 +137,6 @@ void CvEM::read( CvFileStorage* fs, CvFileNode* node )
clear(); clear();
size_t data_size; size_t data_size;
CvEMParams _params;
CvSeqReader reader; CvSeqReader reader;
CvFileNode* em_node = 0; CvFileNode* em_node = 0;
CvFileNode* tmp_node = 0; CvFileNode* tmp_node = 0;
...@@ -157,7 +156,7 @@ void CvEM::read( CvFileStorage* fs, CvFileNode* node ) ...@@ -157,7 +156,7 @@ void CvEM::read( CvFileStorage* fs, CvFileNode* node )
CV_CALL( inv_eigen_values = (CvMat*)cvReadByName( fs, em_node, "inv_eigen_values" )); CV_CALL( inv_eigen_values = (CvMat*)cvReadByName( fs, em_node, "inv_eigen_values" ));
// Size of all the following data // Size of all the following data
data_size = _params.nclusters*2*sizeof(CvMat*); data_size = params.nclusters*2*sizeof(CvMat*);
CV_CALL( tmp_covs = (CvMat**)cvAlloc( data_size )); CV_CALL( tmp_covs = (CvMat**)cvAlloc( data_size ));
memset( tmp_covs, 0, data_size ); memset( tmp_covs, 0, data_size );
......
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