mpegts: Do not call read_sl_header() when no bytes remain in the buffer.

Message ID 20120304205145.3540A5DE5D@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 4, 2012, 8:51 p.m.
Module: libav
Branch: release/0.8
Commit: b7c8fff80351249d448b93608bfac832c1ee3b4b

Author:    Alex Converse <alex.converse@gmail.com>
Committer: Reinhard Tartler <siretart@tauware.de>
Date:      Fri Mar  2 10:12:11 2012 -0800

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
(cherry picked from commit 4df369692ea8aee7094ac0f233cef8d1bee139a3)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>

---

 libavformat/mpegts.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 85e0952..cc36e65 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;