mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 15:04:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11146 from anthonytw:master

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-24 06:35:21 +00:00
commit 300797d4a3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/videoio/src/container_avi.cpp
View File

@ -511,7 +511,12 @@ std::vector<char> AVIReadContainer::readFrame(frame_iterator it)
RiffChunk chunk;
*(m_file_stream) >> chunk;
CV_Assert(chunk.m_size <= 0xFFFF);
// Assertion added to prevent complaints from static analysis tools
// as the chunk size is read from a file then used to allocate
// memory. 64MB was chosen arbitrarily as an upper bound but it may
// be useful to make it configurable.
CV_Assert(chunk.m_size <= 67108864);
std::vector<char> result;