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

Merge pull request #421 from asmaloney:check-mem-alloc2

Browse Source
This commit is contained in:
Andrey Kamaev 2013-02-04 12:02:27 +04:00 committed by OpenCV Buildbot
commit fc4a2244fa
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/objdetect/src/haar.cpp
View File

@ -1935,20 +1935,14 @@ icvLoadCascadeCART( const char** input_cascade, int n, CvSize orig_window_size )
CV_IMPL CvHaarClassifierCascade* CV_IMPL CvHaarClassifierCascade*
cvLoadHaarClassifierCascade( const char* directory, CvSize orig_window_size ) cvLoadHaarClassifierCascade( const char* directory, CvSize orig_window_size )
{ {
const char** input_cascade = 0;
CvHaarClassifierCascade *cascade = 0;
int i, n;
const char* slash;
char name[_MAX_PATH];
int size = 0;
char* ptr = 0;
if( !directory ) if( !directory )
CV_Error( CV_StsNullPtr, "Null path is passed" ); CV_Error( CV_StsNullPtr, "Null path is passed" );
n = (int)strlen(directory)-1; char name[_MAX_PATH];
slash = directory[n] == '\\' || directory[n] == '/' ? "" : "/";
int n = (int)strlen(directory)-1;
const char* slash = directory[n] == '\\' || directory[n] == '/' ? "" : "/";
int size = 0;
/* try to read the classifier from directory */ /* try to read the classifier from directory */
for( n = 0; ; n++ ) for( n = 0; ; n++ )
@ -1969,10 +1963,14 @@ cvLoadHaarClassifierCascade( const char* directory, CvSize orig_window_size )
CV_Error( CV_StsBadArg, "Invalid path" ); CV_Error( CV_StsBadArg, "Invalid path" );
size += (n+1)*sizeof(char*); size += (n+1)*sizeof(char*);
input_cascade = (const char**)cvAlloc( size ); const char** input_cascade = (const char**)cvAlloc( size );
ptr = (char*)(input_cascade + n + 1);
if( !input_cascade )
CV_Error( CV_StsNoMem, "Could not allocate memory for input_cascade" );
char* ptr = (char*)(input_cascade + n + 1);
for( i = 0; i < n; i++ ) for( int i = 0; i < n; i++ )
{ {
sprintf( name, "%s/%d/AdaBoostCARTHaarClassifier.txt", directory, i ); sprintf( name, "%s/%d/AdaBoostCARTHaarClassifier.txt", directory, i );
FILE* f = fopen( name, "rb" ); FILE* f = fopen( name, "rb" );
@ -1990,7 +1988,8 @@ cvLoadHaarClassifierCascade( const char* directory, CvSize orig_window_size )
} }
input_cascade[n] = 0; input_cascade[n] = 0;
cascade = icvLoadCascadeCART( input_cascade, n, orig_window_size );
CvHaarClassifierCascade* cascade = icvLoadCascadeCART( input_cascade, n, orig_window_size );
if( input_cascade ) if( input_cascade )
cvFree( &input_cascade ); cvFree( &input_cascade );