[FFmpeg-cvslog] avutil/frame: Check log2_crop_align

Michael Niedermayer git at videolan.org
Wed Jul 24 17:51:07 EEST 2024


ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Thu Jul 11 23:04:42 2024 +0200| [17a8081d2f50921de6ffdb51b20c2925a60c9a38] | committer: Michael Niedermayer

avutil/frame: Check log2_crop_align

Fixes: CID1604586 Overflowed constant

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 15540b3d28676d5e797764a04f6681dcd01736f8)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17a8081d2f50921de6ffdb51b20c2925a60c9a38
---

 libavutil/frame.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 2e952edd29..83bd2eef3b 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -936,7 +936,7 @@ int av_frame_apply_cropping(AVFrame *frame, int flags)
         if (log2_crop_align < min_log2_align)
             return AVERROR_BUG;
 
-        if (min_log2_align < 5) {
+        if (min_log2_align < 5 && log2_crop_align != INT_MAX) {
             frame->crop_left &= ~((1 << (5 + log2_crop_align - min_log2_align)) - 1);
             calc_cropping_offsets(offsets, frame, desc);
         }



More information about the ffmpeg-cvslog mailing list