[FFmpeg-cvslog] avcodec/rtv1: fix undefined FFALIGN

[Michael Niedermayer]

ffmpeg | branch: release/6.1 | Michael Niedermayer <michael at niedermayer.cc> | Tue Mar 26 02:30:57 2024 +0100| [9a5f191bfb49f66cbe2f5f4b178b2144960028cc] | committer: Michael Niedermayer

avcodec/rtv1: fix undefined FFALIGN

Fixes: signed integer overflow: 2147483647 + 4 cannot be represented in type 'int'
Fixes: 62285/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RTV1_fuzzer-6324303861514240

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 d188a867302fd745b5980a90a0b5cad9016c477c)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/rtv1.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/rtv1.c b/libavcodec/rtv1.c
index 06afe9e873..807c8a3466 100644
--- a/libavcodec/rtv1.c
+++ b/libavcodec/rtv1.c
@@ -113,6 +113,8 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *p,
 
     width = bytestream2_get_le32(&gb);
     height = bytestream2_get_le32(&gb);
+    if (width > INT_MAX-4U || height > INT_MAX-4U)
+        return AVERROR_INVALIDDATA;
     ret = ff_set_dimensions(avctx, FFALIGN(width, 4), FFALIGN(height, 4));
     if (ret < 0)
         return ret;