Update matroskaParser.cpp

to fix heap buffer over-read
justdan96 · Aug 9, 2024 · f5b62fa · f5b62fa
1 parent 7f8667d
commit f5b62fa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tsMuxer/matroskaParser.cpp b/tsMuxer/matroskaParser.cpp
@@ -168,8 +168,8 @@ void ParsedH264TrackData::extractData(AVPacket* pkt, uint8_t* buff, const int si
         else
             THROW(ERR_COMMON, "Unsupported nal unit size " << elSize)
         writeNalHeader(dst);
-        assert((curPos[m_nalSize] & 0x80) == 0);
-        memcpy(dst, curPos + m_nalSize, FFMIN(elSize, (uint32_t)(end - curPos)));
+        assert((curPos < end - m_nalSize) && (curPos[m_nalSize] & 0x80) == 0);
+        memcpy(dst, curPos + m_nalSize, FFMIN(elSize, (uint32_t)(end - curPos - m_nalSize)));
         curPos += elSize + m_nalSize;
         dst += elSize;
     }