Administrator/opencv-MIRROR
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-09-19 15:23:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed infinite loop in FileStorage::open when reading incomplete XML's (ticket #663)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-11-10 20:11:07 +00:00
parent 924497cb5f
commit 728f0eb2f5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/persistence.cpp
View File

@@ -1763,7 +1763,7 @@ icvXMLParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node,
d = ptr[1]; d = ptr[1];
if( c =='<' ) if( c =='<' || c == '\0' )
{ {
CvStringHashNode *key = 0, *key2 = 0; CvStringHashNode *key = 0, *key2 = 0;
CvAttrList* list = 0; CvAttrList* list = 0;
@@ -1773,7 +1773,7 @@ icvXMLParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node,
const char* type_name = 0; const char* type_name = 0;
int elem_type = CV_NODE_NONE; int elem_type = CV_NODE_NONE;
if( d == '/' ) if( d == '/' || c == '\0' )
break; break;
ptr = icvXMLParseTag( fs, ptr, &key, &list, &tag_type ); ptr = icvXMLParseTag( fs, ptr, &key, &list, &tag_type );
@@ -1989,6 +1989,9 @@ icvXMLParseTag( CvFileStorage* fs, char* ptr, CvStringHashNode** _tag,
char c; char c;
int have_space; int have_space;
if( *ptr == '\0' )
CV_PARSE_ERROR( "Preliminary end of the stream" );
if( *ptr != '<' ) if( *ptr != '<' )
CV_PARSE_ERROR( "Tag should start with \'<\'" ); CV_PARSE_ERROR( "Tag should start with \'<\'" );