[FFmpeg-cvslog] avformat/segafilm: Remove outdated check

Andreas Rheinhardt git at videolan.org
Mon Mar 29 07:12:34 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Wed Mar 24 01:21:41 2021 +0100| [117a41b7e3254b50fe299385e35d94be72ba13b6] | committer: Andreas Rheinhardt

avformat/segafilm: Remove outdated check

The check has been added at a time when the code performed the
multiplication itself instead of deferring it to av_malloc_array()
and when our allocation functions used unsigned instead of size_t.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavformat/segafilm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 1225227138..675de00ed2 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -201,8 +201,6 @@ static int film_read_header(AVFormatContext *s)
         return AVERROR_INVALIDDATA;
     film->base_clock = AV_RB32(&scratch[8]);
     film->sample_count = AV_RB32(&scratch[12]);
-    if(film->sample_count >= UINT_MAX / sizeof(film_sample))
-        return -1;
     film->sample_table = av_malloc_array(film->sample_count, sizeof(film_sample));
     if (!film->sample_table)
         return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list