[FFmpeg-devel] [PATCH] mpegts: handle AVMEDIA_TYPE_UNKNOWN correctly

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Sat Oct 22 02:22:21 EEST 2016


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

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

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 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");
-- 
2.9.3


More information about the ffmpeg-devel mailing list