Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15868 from alalek:issue_15857

Browse Source
pull/15890/head
Alexander Alekhin 5 years ago
parent 3d47e043af f42d5399aa
commit 5dd3e6052e
2 changed files with 12 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      modules/core/src/persistence_json.cpp
  2. 6
      modules/core/src/persistence_xml.cpp

8
modules/core/src/persistence_json.cpp
Unescape View File

@ -578,10 +578,14 @@ public:
sz = (int)(ptr - beg);
if( sz > 0 )
{
if (i + sz >= CV_FS_MAX_LEN)
CV_PARSE_ERROR_CPP("string is too long");
memcpy(buf + i, beg, sz);
i += sz;
}
ptr++;
if (i + 1 >= CV_FS_MAX_LEN)
CV_PARSE_ERROR_CPP("string is too long");
switch ( *ptr )
{
case '\\':
@ -605,6 +609,8 @@ public:
sz = (int)(ptr - beg);
if( sz > 0 )
{
if (i + sz >= CV_FS_MAX_LEN)
CV_PARSE_ERROR_CPP("string is too long");
memcpy(buf + i, beg, sz);
i += sz;
}
@ -620,6 +626,8 @@ public:
sz = (int)(ptr - beg);
if( sz > 0 )
{
if (i + sz >= CV_FS_MAX_LEN)
CV_PARSE_ERROR_CPP("string is too long");
memcpy(buf + i, beg, sz);
i += sz;
}

6
modules/core/src/persistence_xml.cpp
Unescape View File

@ -627,6 +627,8 @@ public:
c = '\"';
else
{
if (len + 2 + i >= CV_FS_MAX_LEN)
CV_PARSE_ERROR_CPP("string is too long");
memcpy( strbuf + i, ptr-1, len + 2 );
i += len + 2;
}
@ -635,9 +637,9 @@ public:
CV_PERSISTENCE_CHECK_END_OF_BUFFER_BUG_CPP();
}
}
if (i + 1 >= CV_FS_MAX_LEN)
CV_PARSE_ERROR_CPP("Too long string literal");
strbuf[i++] = c;
if( i >= CV_FS_MAX_LEN )
CV_PARSE_ERROR_CPP( "Too long string literal" );
}
elem->setValue(FileNode::STRING, strbuf, i);
}

Write Preview
Loading…
Cancel
Save