avformat/mpsubdec: Check pts / duration before cast
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 28 Jul 2019 21:05:45 +0000 (23:05 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 23 Aug 2019 20:26:50 +0000 (22:26 +0200)
Fixes: 3e+47 is outside the range of representable values of type 'int'
Fixes: 16057/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5691111307214848

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mpsubdec.c

index 4ff49ba..a8217a4 100644 (file)
@@ -83,13 +83,20 @@ static int mpsub_read_header(AVFormatContext *s)
 
             ff_subtitles_read_chunk(s->pb, &buf);
             if (buf.len) {
+                double ts = current_pts + start*multiplier;
                 sub = ff_subtitles_queue_insert(&mpsub->q, buf.str, buf.len, 0);
                 if (!sub) {
                     res = AVERROR(ENOMEM);
                     goto end;
                 }
-                sub->pts = (int64_t)(current_pts + start*multiplier);
-                sub->duration = (int)(duration * multiplier);
+                if (!isfinite(ts) || ts < INT64_MIN || ts > INT64_MAX) {
+                    avpriv_request_sample(s, "Invalid ts\n");
+                } else
+                    sub->pts = (int64_t)ts;
+                if (!isfinite(duration) || duration * multiplier > INT_MAX || duration < 0) {
+                    avpriv_request_sample(s, "Invalid duration\n");
+                } else
+                    sub->duration = (int)(duration * multiplier);
                 current_pts += (start + duration) * multiplier;
                 sub->pos = pos;
             }