potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23: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.cpp
+21 -4
View File
@@ -59,16 +59,33 @@ char* icvGets( CvFileStorage* fs, char* str, int maxCount )
}
str[j++] = '\0';
fs->strbufpos = i;
if (maxCount > 256)
CV_Assert(j < maxCount - 1 && "OpenCV persistence doesn't support very long lines");
return j > 1 ? str : 0;
}
if( fs->file )
return fgets( str, maxCount, fs->file );
{
char* ptr = fgets( str, maxCount, fs->file );
if (ptr && maxCount > 256)
{
size_t sz = strnlen(ptr, maxCount);
CV_Assert(sz < (size_t)(maxCount - 1) && "OpenCV persistence doesn't support very long lines");
}
return ptr;
}
#if USE_ZLIB
if( fs->gzfile )
return gzgets( fs->gzfile, str, maxCount );
{
char* ptr = gzgets( fs->gzfile, str, maxCount );
if (ptr && maxCount > 256)
{
size_t sz = strnlen(ptr, maxCount);
CV_Assert(sz < (size_t)(maxCount - 1) && "OpenCV persistence doesn't support very long lines");
}
return ptr;
}
#endif
CV_Error( CV_StsError, "The storage is not opened" );
return 0;
CV_ErrorNoReturn(CV_StsError, "The storage is not opened");
}
int icvEof( CvFileStorage* fs )