]> git.sesse.net Git - ffmpeg/commitdiff
avformat/r3d: Check samples before computing duration
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 10 Feb 2021 22:21:53 +0000 (23:21 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 12 Feb 2021 22:42:16 +0000 (23:42 +0100)
Fixes: signed integer overflow: -4611686024827895807 + -4611686016279904256 cannot be represented in type 'long'
Fixes: 30161/clusterfuzz-testcase-minimized-ffmpeg_dem_R3D_fuzzer-5694406713802752
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/r3d.c

index 606ed010d679fcb9d179aad1d0220969d67d3000..9de0fb52c7a3428f11f74233094aeb67406292b6 100644 (file)
@@ -325,7 +325,8 @@ static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
 
     pkt->stream_index = 1;
     pkt->dts = dts;
-    if (st->codecpar->sample_rate)
+
+    if (st->codecpar->sample_rate && samples > 0)
         pkt->duration = av_rescale(samples, st->time_base.den, st->codecpar->sample_rate);
     av_log(s, AV_LOG_TRACE, "pkt dts %"PRId64" duration %"PRId64" samples %d sample rate %d\n",
             pkt->dts, pkt->duration, samples, st->codecpar->sample_rate);