avformat/mpegts: Check desc_len / get8() return code
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 02:29:40 +0000 (04:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Oct 2014 03:29:31 +0000 (05:29 +0200)
Fixes out of array read
Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3d7f00ee3e09801f56f25db8b5961f25e842bd2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c

index 93344d7..bf97602 100644 (file)
@@ -1988,7 +1988,7 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
                 break;
             desc_len = get8(&p, desc_list_end);
             desc_end = p + desc_len;
-            if (desc_end > desc_list_end)
+            if (desc_len < 0 || desc_end > desc_list_end)
                 break;
 
             av_dlog(ts->stream, "tag: 0x%02x len=%d\n",