diff mbox series

[FFmpeg-devel,4/4] avformat/wavdec: Use 64bit in new_pos computation

Message ID 20210427192135.17286-4-michael@niedermayer.cc
State Accepted
Commit 9b57d2f0a967195dc1c72fda8f3a983a0132a243
Headers show
Series [FFmpeg-devel,1/4] avformat/rmdec: Check old_format len for overflow | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Michael Niedermayer April 27, 2021, 7:21 p.m. UTC
Fixes: signed integer overflow: 129 * 16711680 cannot be represented in type 'int'
Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-6742285317439488

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/wavdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer July 31, 2021, 8:11 p.m. UTC | #1
On Tue, Apr 27, 2021 at 09:21:35PM +0200, Michael Niedermayer wrote:
> Fixes: signed integer overflow: 129 * 16711680 cannot be represented in type 'int'
> Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-6742285317439488
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/wavdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

[...]
diff mbox series

Patch

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index e11535b6ae..af32d15092 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -718,7 +718,7 @@  smv_retry:
         if (wav->smv_last_stream) {
             uint64_t old_pos = avio_tell(s->pb);
             uint64_t new_pos = wav->smv_data_ofs +
-                wav->smv_block * wav->smv_block_size;
+                wav->smv_block * (int64_t)wav->smv_block_size;
             if (avio_seek(s->pb, new_pos, SEEK_SET) < 0) {
                 ret = AVERROR_EOF;
                 goto smv_out;