diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 04:29:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 05:30:22 +0200 |
| commit | c4f0f3c52d977b58dc7723fbcb97ee8b1b0f588d (patch) | |
| tree | 6adf3a7f6c5319e8f5501026c4c5606ae55a09a7 | |
| parent | 4865948d2ea9d239ce0ebfe40420d111799ee742 (diff) | |
| download | ffmpeg-c4f0f3c52d977b58dc7723fbcb97ee8b1b0f588d.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>
(cherry picked from commit c3d7f00ee3e09801f56f25db8b5961f25e842bd2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -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 c2efb53b2c..58633d8a92 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1695,7 +1695,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", |