diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2024-07-10 17:49:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2024-07-12 22:16:05 +0200 |
| commit | ba63e329572b74207045fd82c93fcc0fa0479bc4 (patch) | |
| tree | 9c0ecb14c3ad274c64c9641622d765cdbf461d17 | |
| parent | 20e59af07e5e9a73cb3227355fe0a78afffdfe45 (diff) | |
| download | ffmpeg-ba63e329572b74207045fd82c93fcc0fa0479bc4.tar.gz | |
avutil/imgutils: av_image_check_size2() ensure width and height fit in 32bit
width and height > 32bit is not supported and its easier to check in a central place
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/imgutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index d246381563..7b88738e2d 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -298,7 +298,7 @@ int av_image_check_size2(unsigned int w, unsigned int h, int64_t max_pixels, enu stride = 8LL*w; stride += 128*8; - if ((int)w<=0 || (int)h<=0 || stride >= INT_MAX || stride*(uint64_t)(h+128) >= INT_MAX) { + if (w==0 || h==0 || w > INT32_MAX || h > INT32_MAX || stride >= INT_MAX || stride*(h + 128ULL) >= INT_MAX) { av_log(&imgutils, AV_LOG_ERROR, "Picture size %ux%u is invalid\n", w, h); return AVERROR(EINVAL); } |