summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--dxr3pesframe.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/HISTORY b/HISTORY
index d734f5e..655fc56 100644
--- a/HISTORY
+++ b/HISTORY
@@ -293,3 +293,4 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
- register only needed ffmpeg codec(s) (Marco Schlüßler)
- fix crash at exit (Marco Schlüßler)
- add support for mandatory subtitles (Marco Schlüßler)
+- avoid crashing with some corrupted streams (Jon Burgess)
diff --git a/dxr3pesframe.c b/dxr3pesframe.c
index cb953a4..746879b 100644
--- a/dxr3pesframe.c
+++ b/dxr3pesframe.c
@@ -44,6 +44,12 @@ bool cDxr3PesFrame::ExtractNextFrame(const uint8_t* pBuf, uint32_t length)
if (length > 9)
{
for (; pos + 9 < length && !IsPesHeader(pesArray.SubArray(pos, 4)); pos++);
+ if (pos + 9 >= length)
+ {
+ // Corrupt stream?
+ m_remainingLength = 0;
+ return m_bValid;
+ }
m_pPesStart = pBuf + pos;
if ((pesArray[pos + 6] & 0xC0) == 0x80