[FFmpeg-cvslog] avcodec/takdec: Fix multiple runtime error: signed integer overflow: 637072 * 4096 cannot be represented in type 'int'
Michael Niedermayer
git at videolan.org
Thu Aug 24 15:02:39 EEST 2017
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Tue Jun 6 16:01:16 2017 +0200| [8dc06a1cb151f6162fec554ac5113147eeadd7a5] | committer: Michael Niedermayer
avcodec/takdec: Fix multiple runtime error: signed integer overflow: 637072 * 4096 cannot be represented in type 'int'
Fixes: 2079/clusterfuzz-testcase-minimized-5345861779324928
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit e4efd41b83e78c7f2ee3e74bee90226110743a8e)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dc06a1cb151f6162fec554ac5113147eeadd7a5
---
libavcodec/takdec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 17a848b4b3..97cdb622c8 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -857,7 +857,7 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
if (s->sample_shift[chan] > 0)
for (i = 0; i < s->nb_samples; i++)
- decoded[i] *= 1 << s->sample_shift[chan];
+ decoded[i] *= 1U << s->sample_shift[chan];
}
}
@@ -899,7 +899,7 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
for (chan = 0; chan < avctx->channels; chan++) {
int32_t *samples = (int32_t *)frame->extended_data[chan];
for (i = 0; i < s->nb_samples; i++)
- samples[i] *= 1 << 8;
+ samples[i] *= 1U << 8;
}
break;
}
More information about the ffmpeg-cvslog
mailing list