diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-05-06 12:56:13 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-05-10 06:49:32 +0200 |
| commit | 84091cd029711fea75eca359b101124ff792e964 (patch) | |
| tree | f51a7998d2719432268fbf5ea88ff70ed28ca56f /libavformat/utils.c | |
| parent | f2b79c5b855b7450c8f3c15b9ec11b439cd2a294 (diff) | |
| download | ffmpeg-84091cd029711fea75eca359b101124ff792e964.tar.gz | |
avformat/utils: Use av_realloc_array for reallocating array
Also improve the size check a bit; given that av_realloc_array()
checks for overflow itself, we only have to check for
nb_side_data + 1 still being representable in an int.
But given that we can check for representability in size_t
at no additional cost we do so as it leads to a nicer error code.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 19f5ae720c..a905838468 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1739,10 +1739,10 @@ int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, } } - if ((unsigned)st->nb_side_data + 1 >= INT_MAX / sizeof(*st->side_data)) + if (st->nb_side_data + 1U > FFMIN(INT_MAX, SIZE_MAX / sizeof(*tmp))) return AVERROR(ERANGE); - tmp = av_realloc(st->side_data, (st->nb_side_data + 1) * sizeof(*tmp)); + tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp)); if (!tmp) { return AVERROR(ENOMEM); } |