diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-03-02 10:12:11 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-03-02 15:44:42 -0800 |
| commit | 4df369692ea8aee7094ac0f233cef8d1bee139a3 (patch) | |
| tree | 30312d3e00788881db3c24a405bfb834542cf777 /libavformat | |
| parent | 9d87374ec0f382c8394ad511243db6980afa42af (diff) | |
| download | ffmpeg-4df369692ea8aee7094ac0f233cef8d1bee139a3.tar.gz | |
mpegts: Do not call read_sl_header() when no bytes remain in the buffer.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index b105d8c108..32901a1919 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -889,7 +889,7 @@ static int mpegts_push_data(MpegTSFilter *filter, /* we got the full header. We parse it and get the payload */ pes->state = MPEGTS_PAYLOAD; pes->data_index = 0; - if (pes->stream_type == 0x12) { + if (pes->stream_type == 0x12 && buf_size > 0) { int sl_header_bytes = read_sl_header(pes, &pes->sl, p, buf_size); pes->pes_header_size += sl_header_bytes; p += sl_header_bytes; |