potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

core: added checks and "fixit" items for persistence parsers

Browse Source 
To raise errors with proper messages of the problems.
This commit is contained in:
Alexander Alekhin
2018-03-14 14:03:46 +03:00
parent 7ee217285b
commit f4c4b01455
5 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence_json.cpp
+17 -3
View File
@@ -125,8 +125,10 @@ static char* icvJSONParseKey( CvFileStorage* fs, char* ptr, CvFileNode* map, CvF
char * beg = ptr + 1;
char * end = beg;
do ++ptr;
while( cv_isprint(*ptr) && *ptr != '"' );
do {
++ptr;
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG();
} while( cv_isprint(*ptr) && *ptr != '"' );
if( *ptr != '"' )
CV_PARSE_ERROR( "Key must end with \'\"\'" );
@@ -367,17 +369,25 @@ static char* icvJSONParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node )
{ /**************** number ****************/
char * beg = ptr;
if ( *ptr == '+' || *ptr == '-' )
{
ptr++;
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG();
}
while( cv_isdigit(*ptr) )
{
ptr++;
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG();
}
if (*ptr == '.' || *ptr == 'e')
{
node->data.f = icv_strtod( fs, beg, &ptr );
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG();
node->tag = CV_NODE_REAL;
}
else
{
node->data.i = static_cast<int>(strtol( beg, &ptr, 0 ));
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG();
node->tag = CV_NODE_INT;
}
@@ -388,8 +398,12 @@ static char* icvJSONParseValue( CvFileStorage* fs, char* ptr, CvFileNode* node )
{ /**************** other data ****************/
const char * beg = ptr;
size_t len = 0u;
for ( ; cv_isalpha(*ptr) && len <= 6u; ptr++ )
for ( ; cv_isalpha(*ptr) && len <= 6u; )
{
len++;
ptr++;
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG();
}
if ( len >= 4u && memcmp( beg, "null", 4u ) == 0 )
{