Re: [FFmpeg-devel] [PATCH 4/5] avformat/utils: Use 64bit earlier in r_frame_rate check

[Michael Niedermayer]

On Tue, Apr 13, 2021 at 05:45:38PM +0200, Michael Niedermayer wrote:
> Fixes: signed integer overflow: 1406796319 * 2 cannot be represented in type 
> 'int'
> Fixes: 
> 32777/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5632576913014784
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Never trust a computer, one day, it may think you are the virus. -- Compn


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/5] avformat/utils: Use 64bit earlier in r_frame_rate check

[Michael Niedermayer]

Fixes: signed integer overflow: 1406796319 * 2 cannot be represented in type 
'int'
Fixes: 
32777/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5632576913014784

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d9971d7fd3..3ed01b2110 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4109,7 +4109,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
 if (!st->r_frame_rate.num) {
 if (avctx->time_base.den * (int64_t) st->time_base.num
-<= avctx->time_base.num * avctx->ticks_per_frame * 
(uint64_t) st->time_base.den) {
+<= avctx->time_base.num * (uint64_t)avctx->ticks_per_frame 
* st->time_base.den) {
 av_reduce(>r_frame_rate.num, >r_frame_rate.den,
   avctx->time_base.den, 
(int64_t)avctx->time_base.num * avctx->ticks_per_frame, INT_MAX);
 } else {
-- 
2.17.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".