diff mbox series

[FFmpeg-devel,02/44] avformat/utils: Use av_realloc_array for reallocating array

Message ID AS8PR01MB794477D1BA34E5C9FB760E4C8FC49@AS8PR01MB7944.eurprd01.prod.exchangelabs.com
State Accepted
Commit 84091cd029711fea75eca359b101124ff792e964
Headers show
Series [FFmpeg-devel] lib*/version: Move library version functions into files of their own | expand

Commit Message

Andreas Rheinhardt May 7, 2022, 11:27 a.m. UTC 
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>
---
 libavformat/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

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);
     }