[FFmpeg-cvslog] mpeg-ts: fix handling of size=0 SL headers.

Michael Niedermayer git at videolan.org
Sat Mar 3 21:25:02 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar  3 07:43:32 2012 +0100| [e732d0f60872bf273eb56ef17b23a543fd74479f] | committer: Michael Niedermayer

mpeg-ts: fix handling of size=0 SL headers.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e732d0f60872bf273eb56ef17b23a543fd74479f
---

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

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 81649c7..3d825fe 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -710,6 +710,12 @@ static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf
     int padding_flag = 0, padding_bits = 0, inst_bitrate_flag = 0;
     int dts_flag = -1, cts_flag = -1;
     int64_t dts = AV_NOPTS_VALUE, cts = AV_NOPTS_VALUE;
+
+    if (buf_size<=0) {
+        av_log(0,AV_LOG_WARNING, "empty SL header\n");
+        return 0;
+    }
+
     init_get_bits(&gb, buf, buf_size*8);
 
     if (sl->use_au_start)



More information about the ffmpeg-cvslog mailing list