Merge pull request opencv#15145 from alalek:fix_15127

alalek · alalek · commit 79859ebca32f · 2019-07-25T16:14:25.000Z
diff --git a/modules/core/src/persistence_json.cpp b/modules/core/src/persistence_json.cpp
@@ -296,6 +296,8 @@ class JSONParser : public FileStorageParser
 
         while ( is_eof == false && is_completed == false )
         {
+            if (!ptr)
+                CV_PARSE_ERROR_CPP("Invalid input");
             switch ( *ptr )
             {
                 /* comment */
@@ -381,6 +383,7 @@ class JSONParser : public FileStorageParser
         if ( is_eof || !is_completed )
         {
             ptr = fs->bufferStart();
+            CV_Assert(ptr);
             *ptr = '\0';
             fs->setEof();
             if( !is_completed )
@@ -392,6 +395,9 @@ class JSONParser : public FileStorageParser
 
     char* parseKey( char* ptr, FileNode& collection, FileNode& value_placeholder )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         if( *ptr != '"' )
             CV_PARSE_ERROR_CPP( "Key must start with \'\"\'" );
 
@@ -430,6 +436,9 @@ class JSONParser : public FileStorageParser
 
     char* parseValue( char* ptr, FileNode& node )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid value input");
+
         ptr = skipSpaces( ptr );
         if( !ptr || !*ptr )
             CV_PARSE_ERROR_CPP( "Unexpected End-Of-File" );
@@ -817,6 +826,9 @@ class JSONParser : public FileStorageParser
 
     bool parse( char* ptr )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         ptr = skipSpaces( ptr );
         if ( !ptr || !*ptr )
             return false;
diff --git a/modules/core/src/persistence_xml.cpp b/modules/core/src/persistence_xml.cpp
@@ -360,6 +360,9 @@ class XMLParser : public FileStorageParser
 
     char* skipSpaces( char* ptr, int mode )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         int level = 0;
 
         for(;;)
@@ -441,6 +444,9 @@ class XMLParser : public FileStorageParser
 
     char* parseValue( char* ptr, FileNode& node )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         FileNode new_elem;
         bool have_space = true;
         int value_type = node.type();
@@ -456,6 +462,8 @@ class XMLParser : public FileStorageParser
                 (c == '<' && ptr[1] == '!' && ptr[2] == '-') )
             {
                 ptr = skipSpaces( ptr, 0 );
+                if (!ptr)
+                    CV_PARSE_ERROR_CPP("Invalid input");
                 have_space = true;
                 c = *ptr;
             }
@@ -502,6 +510,8 @@ class XMLParser : public FileStorageParser
                 {
                     ptr = fs->parseBase64( ptr, 0, new_elem);
                     ptr = skipSpaces( ptr, 0 );
+                    if (!ptr)
+                        CV_PARSE_ERROR_CPP("Invalid input");
                 }
 
                 ptr = parseTag( ptr, key2, type_name, tag_type );
@@ -645,6 +655,9 @@ class XMLParser : public FileStorageParser
     char* parseTag( char* ptr, std::string& tag_name,
                     std::string& type_name, int& tag_type )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid tag input");
+
         if( *ptr == '\0' )
             CV_PARSE_ERROR_CPP( "Unexpected end of the stream" );
 
@@ -702,6 +715,8 @@ class XMLParser : public FileStorageParser
                 if( *ptr != '=' )
                 {
                     ptr = skipSpaces( ptr, CV_XML_INSIDE_TAG );
+                    if (!ptr)
+                        CV_PARSE_ERROR_CPP("Invalid attribute");
                     if( *ptr != '=' )
                         CV_PARSE_ERROR_CPP( "Attribute name should be followed by \'=\'" );
                 }
@@ -740,6 +755,8 @@ class XMLParser : public FileStorageParser
             if( c != '>' )
             {
                 ptr = skipSpaces( ptr, CV_XML_INSIDE_TAG );
+                if (!ptr)
+                    CV_PARSE_ERROR_CPP("Invalid input");
                 c = *ptr;
             }
 
@@ -781,6 +798,8 @@ class XMLParser : public FileStorageParser
 
         // CV_XML_INSIDE_TAG is used to prohibit leading comments
         ptr = skipSpaces( ptr, CV_XML_INSIDE_TAG );
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
 
         if( memcmp( ptr, "<?xml", 5 ) != 0 )  // FIXIT ptr[1..] - out of bounds read without check
             CV_PARSE_ERROR_CPP( "Valid XML should start with \'<?xml ...?>\'" );
@@ -791,6 +810,8 @@ class XMLParser : public FileStorageParser
         while( ptr && *ptr != '\0' )
         {
             ptr = skipSpaces( ptr, 0 );
+            if (!ptr)
+                CV_PARSE_ERROR_CPP("Invalid input");
 
             if( *ptr != '\0' )
             {
diff --git a/modules/core/src/persistence_yml.cpp b/modules/core/src/persistence_yml.cpp
@@ -330,6 +330,9 @@ class YAMLParser : public FileStorageParser
 
     char* skipSpaces( char* ptr, int min_indent, int max_comment_indent )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         for(;;)
         {
             while( *ptr == ' ' )
@@ -374,6 +377,9 @@ class YAMLParser : public FileStorageParser
 
     bool getBase64Row(char* ptr, int indent, char* &beg, char* &end)
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         beg = end = ptr = skipSpaces(ptr, 0, INT_MAX);
         if (!ptr || !*ptr)
             return false; // end of file
@@ -394,6 +400,9 @@ class YAMLParser : public FileStorageParser
 
     char* parseKey( char* ptr, FileNode& map_node, FileNode& value_placeholder )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         char c;
         char *endptr = ptr - 1, *saveptr;
 
@@ -422,6 +431,9 @@ class YAMLParser : public FileStorageParser
 
     char* parseValue( char* ptr, FileNode& node, int min_indent, bool is_parent_flow )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         char* endptr = 0;
         char c = ptr[0], d = ptr[1];
         int value_type = FileNode::NONE;
@@ -508,6 +520,8 @@ class YAMLParser : public FileStorageParser
 
             *endptr = d;
             ptr = skipSpaces( endptr, min_indent, INT_MAX );
+            if (!ptr)
+                CV_PARSE_ERROR_CPP("Invalid input");
 
             c = *ptr;
 
@@ -634,6 +648,8 @@ class YAMLParser : public FileStorageParser
                 FileNode elem;
 
                 ptr = skipSpaces( ptr, new_min_indent, INT_MAX );
+                if (!ptr)
+                    CV_PARSE_ERROR_CPP("Invalid input");
                 if( *ptr == '}' || *ptr == ']' )
                 {
                     if( *ptr != d )
@@ -647,6 +663,8 @@ class YAMLParser : public FileStorageParser
                     if( *ptr != ',' )
                         CV_PARSE_ERROR_CPP( "Missing , between the elements" );
                     ptr = skipSpaces( ptr + 1, new_min_indent, INT_MAX );
+                    if (!ptr)
+                        CV_PARSE_ERROR_CPP("Invalid input");
                 }
 
                 if( struct_type == FileNode::MAP )
@@ -746,6 +764,9 @@ class YAMLParser : public FileStorageParser
 
     bool parse( char* ptr )
     {
+        if (!ptr)
+            CV_PARSE_ERROR_CPP("Invalid input");
+
         bool first = true;
         bool ok = true;
         FileNode root_collection(fs->getFS(), 0, 0);

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,9 @@ class XMLParser : public FileStorageParser`
`360`	`360`
`361`	`361`	`char* skipSpaces( char* ptr, int mode )`
`362`	`362`	`{`
	`363`	`+ if (!ptr)`
	`364`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
	`365`	`+`
`363`	`366`	`int level = 0;`
`364`	`367`
`365`	`368`	`for(;;)`
`@@ -441,6 +444,9 @@ class XMLParser : public FileStorageParser`
`441`	`444`
`442`	`445`	`char* parseValue( char* ptr, FileNode& node )`
`443`	`446`	`{`
	`447`	`+ if (!ptr)`
	`448`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
	`449`	`+`
`444`	`450`	`FileNode new_elem;`
`445`	`451`	`bool have_space = true;`
`446`	`452`	`int value_type = node.type();`
`@@ -456,6 +462,8 @@ class XMLParser : public FileStorageParser`
`456`	`462`	`(c == '<' && ptr[1] == '!' && ptr[2] == '-') )`
`457`	`463`	`{`
`458`	`464`	`ptr = skipSpaces( ptr, 0 );`
	`465`	`+ if (!ptr)`
	`466`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
`459`	`467`	`have_space = true;`
`460`	`468`	`c = *ptr;`
`461`	`469`	`}`
`@@ -502,6 +510,8 @@ class XMLParser : public FileStorageParser`
`502`	`510`	`{`
`503`	`511`	`ptr = fs->parseBase64( ptr, 0, new_elem);`
`504`	`512`	`ptr = skipSpaces( ptr, 0 );`
	`513`	`+ if (!ptr)`
	`514`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
`505`	`515`	`}`
`506`	`516`
`507`	`517`	`ptr = parseTag( ptr, key2, type_name, tag_type );`
`@@ -645,6 +655,9 @@ class XMLParser : public FileStorageParser`
`645`	`655`	`char* parseTag( char* ptr, std::string& tag_name,`
`646`	`656`	`std::string& type_name, int& tag_type )`
`647`	`657`	`{`
	`658`	`+ if (!ptr)`
	`659`	`+ CV_PARSE_ERROR_CPP("Invalid tag input");`
	`660`	`+`
`648`	`661`	`if( *ptr == '\0' )`
`649`	`662`	`CV_PARSE_ERROR_CPP( "Unexpected end of the stream" );`
`650`	`663`
`@@ -702,6 +715,8 @@ class XMLParser : public FileStorageParser`
`702`	`715`	`if( *ptr != '=' )`
`703`	`716`	`{`
`704`	`717`	`ptr = skipSpaces( ptr, CV_XML_INSIDE_TAG );`
	`718`	`+ if (!ptr)`
	`719`	`+ CV_PARSE_ERROR_CPP("Invalid attribute");`
`705`	`720`	`if( *ptr != '=' )`
`706`	`721`	`CV_PARSE_ERROR_CPP( "Attribute name should be followed by \'=\'" );`
`707`	`722`	`}`
`@@ -740,6 +755,8 @@ class XMLParser : public FileStorageParser`
`740`	`755`	`if( c != '>' )`
`741`	`756`	`{`
`742`	`757`	`ptr = skipSpaces( ptr, CV_XML_INSIDE_TAG );`
	`758`	`+ if (!ptr)`
	`759`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
`743`	`760`	`c = *ptr;`
`744`	`761`	`}`
`745`	`762`
`@@ -781,6 +798,8 @@ class XMLParser : public FileStorageParser`
`781`	`798`
`782`	`799`	`// CV_XML_INSIDE_TAG is used to prohibit leading comments`
`783`	`800`	`ptr = skipSpaces( ptr, CV_XML_INSIDE_TAG );`
	`801`	`+ if (!ptr)`
	`802`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
`784`	`803`
`785`	`804`	`if( memcmp( ptr, "<?xml", 5 ) != 0 ) // FIXIT ptr[1..] - out of bounds read without check`
`786`	`805`	`CV_PARSE_ERROR_CPP( "Valid XML should start with \'<?xml ...?>\'" );`
`@@ -791,6 +810,8 @@ class XMLParser : public FileStorageParser`
`791`	`810`	`while( ptr && *ptr != '\0' )`
`792`	`811`	`{`
`793`	`812`	`ptr = skipSpaces( ptr, 0 );`
	`813`	`+ if (!ptr)`
	`814`	`+ CV_PARSE_ERROR_CPP("Invalid input");`
`794`	`815`
`795`	`816`	`if( *ptr != '\0' )`
`796`	`817`	`{`