OSDN Git Service

avformat/mpegts: check sl.timestamp_len
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Dec 2013 10:45:55 +0000 (11:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Dec 2013 10:53:53 +0000 (11:53 +0100)
Fixes: msan_uninit-mem_7ff4404547ba_4883_dmbts.ts
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegts.c

index 18d8d8f..39b1b5d 100644 (file)
@@ -1256,6 +1256,11 @@ static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len)
         descr->sl.timestamp_res      = avio_rb32(&d->pb);
                                        avio_rb32(&d->pb);
         descr->sl.timestamp_len      = avio_r8(&d->pb);
+        if (descr->sl.timestamp_len > 64) {
+            avpriv_request_sample(NULL, "timestamp_len > 64");
+            descr->sl.timestamp_len = 64;
+            return AVERROR_PATCHWELCOME;
+        }
         descr->sl.ocr_len            = avio_r8(&d->pb);
         descr->sl.au_len             = avio_r8(&d->pb);
         descr->sl.inst_bitrate_len   = avio_r8(&d->pb);