[FFmpeg-cvslog] avformat/mpc8: correct 32bit timestamp truncation
Michael Niedermayer
git at videolan.org
Fri Nov 27 01:27:50 EET 2020
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Nov 3 01:14:26 2020 +0100| [ad3e495657eaa24cba9251c2379797c208998201] | committer: Michael Niedermayer
avformat/mpc8: correct 32bit timestamp truncation
Fixes: left shift of 65536 by 15 places cannot be represented in type 'int'
Fixes: 26801/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-5164313092030464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad3e495657eaa24cba9251c2379797c208998201
---
libavformat/mpc8.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 0002e2a9dd..2b5eefe8c3 100644
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -183,7 +183,7 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off)
if(t & 1)
t = -(t & ~1);
pos = (t >> 1) + ppos[0]*2 - ppos[1];
- av_add_index_entry(s->streams[0], pos, i << seekd, 0, 0, AVINDEX_KEYFRAME);
+ av_add_index_entry(s->streams[0], pos, (int64_t)i << seekd, 0, 0, AVINDEX_KEYFRAME);
ppos[1] = ppos[0];
ppos[0] = pos;
}
@@ -258,7 +258,7 @@ static int mpc8_read_header(AVFormatContext *s)
st->codecpar->channels = (st->codecpar->extradata[1] >> 4) + 1;
st->codecpar->sample_rate = mpc8_rate[st->codecpar->extradata[0] >> 5];
- avpriv_set_pts_info(st, 32, 1152 << (st->codecpar->extradata[1]&3)*2, st->codecpar->sample_rate);
+ avpriv_set_pts_info(st, 64, 1152 << (st->codecpar->extradata[1]&3)*2, st->codecpar->sample_rate);
st->start_time = 0;
st->duration = c->samples / (1152 << (st->codecpar->extradata[1]&3)*2);
size -= avio_tell(pb) - pos;
More information about the ffmpeg-cvslog
mailing list