[FFmpeg-devel] [PATCH 06/12] mov: validate sidx timescale

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Sun Oct 23 19:29:03 EEST 2016


A negative timescale doesn't make sense and triggers assertions in
av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavformat/mov.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6f313a5..413675f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4233,6 +4233,11 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     timescale = av_make_q(1, avio_rb32(pb));
 
+    if (timescale.den <= 0) {
+        av_log(c->fc, AV_LOG_ERROR, "Invalid sidx timescale 1/%d\n", timescale.den);
+        return AVERROR_INVALIDDATA;
+    }
+
     if (version == 0) {
         pts = avio_rb32(pb);
         offset += avio_rb32(pb);
-- 
2.9.3



More information about the ffmpeg-devel mailing list