[FFmpeg-cvslog] mpegts: handle AVMEDIA_TYPE_UNKNOWN correctly

Andreas Cadhalpun git at videolan.org
Sat Oct 22 20:24:12 EEST 2016


ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Sat Oct 22 01:18:38 2016 +0200| [178eebd79e5bf3f4a4471576cd1a48bf9df59e09] | committer: Andreas Cadhalpun

mpegts: handle AVMEDIA_TYPE_UNKNOWN correctly

It is negative, so can't be used for left shifting.

This fixes ubsan runtime error: shift exponent -1 is negative

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

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

 libavformat/mpegts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 97a2225..cc2addc 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2353,7 +2353,8 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
                 int types = 0;
                 for (i = 0; i < ts->stream->nb_streams; i++) {
                     AVStream *st = ts->stream->streams[i];
-                    types |= 1<<st->codecpar->codec_type;
+                    if (st->codecpar->codec_type >= 0)
+                        types |= 1<<st->codecpar->codec_type;
                 }
                 if ((types & (1<<AVMEDIA_TYPE_AUDIO) && types & (1<<AVMEDIA_TYPE_VIDEO)) || pos > 100000) {
                     av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n");



More information about the ffmpeg-cvslog mailing list