aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-04 04:29:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-04 04:30:59 +0200
commitc3d7f00ee3e09801f56f25db8b5961f25e842bd2 (patch)
tree771effc4d28161526f576a15538c0860214209c9
parent8c50704ebf1777bee76772c4835d9760b3721057 (diff)
downloadffmpeg-c3d7f00ee3e09801f56f25db8b5961f25e842bd2.tar.gz
avformat/mpegts: Check desc_len / get8() return code
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>
-rw-r--r--libavformat/mpegts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 2252b44949..a6b966b779 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -1994,7 +1994,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",