Merge pull request #11146 from anthonytw:master

pull/11151/head
Alexander Alekhin 7 years ago
commit 300797d4a3
  1. 7
      modules/videoio/src/container_avi.cpp

@ -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;

Loading…
Cancel
Save