[FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: Use 64bit for score computation in map_auto_video() (PR #20229)

[michaelni]

PR #20229 opened by michaelni
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20229
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20229.patch

Fixes: signed integer overflow: 10 * 1952737655 cannot be represented in type 'int'
Fixes: PoC_avi_demux

Found-by: 2ourc3 (Salim LARGO)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>


From a3accb09575ba6ad7a9925d0c18e2ad79da6ca7d Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael at niedermayer.cc>
Date: Wed, 13 Aug 2025 00:59:20 +0200
Subject: [PATCH] fftools/ffmpeg_mux_init: Use 64bit for score computation in
 map_auto_video()

Fixes: signed integer overflow: 10 * 1952737655 cannot be represented in type 'int'
Fixes: PoC_avi_demux

Found-by: 2ourc3 (Salim LARGO)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 fftools/ffmpeg_mux_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 4a973e5286..48b2220bfa 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1613,7 +1613,7 @@ static int map_auto_video(Muxer *mux, const OptionsContext *o)
                 ist->st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO)
                 continue;
 
-            score = ist->st->codecpar->width * ist->st->codecpar->height
+            score = ist->st->codecpar->width * (int64_t)ist->st->codecpar->height
                        + 100000000 * !!(ist->st->event_flags & AVSTREAM_EVENT_FLAG_NEW_PACKETS)
                        + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT);
             if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC))
-- 
2.49.1